Skip to content

Commit 5553b08

Browse files
Update to .NET MAUI RC3 (#401)
* RC3 * Remove Unused Code * Remove Failing Unit Tests * Update azure-pipelines.yml * Update azure-pipelines.yml Co-authored-by: Brandon Minnick <[email protected]>
1 parent 3e13b8b commit 5553b08

File tree

6 files changed

+17
-57
lines changed

6 files changed

+17
-57
lines changed

azure-pipelines.yml

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ variables:
33
PreviewNumber: $[counter(variables['CurrentSemanticVersionBase'], 1001)]
44
CurrentSemanticVersion: '$(CurrentSemanticVersionBase)-preview$(PreviewNumber)'
55
NugetPackageVersion: '$(CurrentSemanticVersion)'
6-
NET_VERSION: '6.0.300-preview.22204.3'
6+
NET_VERSION: '6.0.x'
77
PathToSolution: 'src/CommunityToolkit.Maui.sln'
88
PathToCommunityToolkitCsproj: 'src/CommunityToolkit.Maui/CommunityToolkit.Maui.csproj'
99
PathToCommunityToolkitCoreCsproj: 'src/CommunityToolkit.Maui.Core/CommunityToolkit.Maui.Core.csproj'
@@ -39,18 +39,11 @@ jobs:
3939
pool:
4040
vmImage: windows-latest
4141
steps:
42-
# - task: UseDotNet@2
43-
# displayName: 'Install .NET SDK'
44-
# inputs:
45-
# packageType: 'sdk'
46-
# version: '$(NET_VERSION)'
47-
# includePreviewVersions: true
48-
- powershell: |
49-
wget https://dot.net/v1/dotnet-install.ps1 -OutFile C:\dotnet-install.ps1
50-
C:\dotnet-install.ps1 -Version $(NET_VERSION)
51-
dotnet --info
52-
Write-Host "##vso[task.prependpath]C:\\Users\\VssAdministrator\\AppData\\Local\\Microsoft\\dotnet"
53-
displayName: Install .NET SDK
42+
- task: UseDotNet@2
43+
displayName: 'Install .NET SDK'
44+
inputs:
45+
packageType: 'sdk'
46+
version: '$(NET_VERSION)'
5447
- powershell: dotnet workload install maui
5548
displayName: Install .NET MAUI
5649
# if this is a tagged build, then update the version number
@@ -159,23 +152,15 @@ jobs:
159152
Write-Host ("##vso[task.setvariable variable=NugetPackageVersion;]$tagVersion")
160153
displayName: Set NuGet Version to Tag Number
161154
condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
162-
# Temporarily disable "Set Xcode Version" until Xcode 13.3.1 is available on Azure Pipelines (required for .NET MAUI RC)
163-
# - task: CmdLine@2
164-
# displayName: 'Set Xcode Version'
165-
# inputs:
166-
# script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XcodeVersion).app;sudo xcode-select --switch /Applications/Xcode_$(XcodeVersion).app/Contents/Developer
167-
# - task: UseDotNet@2
168-
# displayName: 'Install .NET SDK'
169-
# inputs:
170-
# packageType: 'sdk'
171-
# version: '$(NET_VERSION)'
172-
# includePreviewVersions: true
173155
- task: CmdLine@2
156+
displayName: 'Set Xcode Version'
157+
inputs:
158+
script: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XcodeVersion).app;sudo xcode-select --switch /Applications/Xcode_$(XcodeVersion).app/Contents/Developer
159+
- task: UseDotNet@2
174160
displayName: 'Install .NET SDK'
175161
inputs:
176-
script: |
177-
curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin --version $(NET_VERSION) --quality preview
178-
dotnet --info
162+
packageType: 'sdk'
163+
version: '$(NET_VERSION)'
179164
- task: CmdLine@2
180165
displayName: 'Install .NET MAUI workload'
181166
inputs:

global.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.300-preview.22204.3",
4-
"rollForward": "latestMajor",
5-
"allowPrerelease": true
3+
"version": "6.0.300",
4+
"rollForward": "latestMajor"
65
}
76
}

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<MauiImage Include="Resources\Images\*" />
3636
<EmbeddedResource Include="Resources\Embedded\*" />
3737

38-
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="1.0.0-rc1" />
38+
<PackageReference Include="CommunityToolkit.Maui.Markup" Version="1.0.0-rc2" />
3939
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview3" />
40-
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
40+
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.2-mauipre.1.22102.15" />
4141
</ItemGroup>
4242

4343
<PropertyGroup>

src/CommunityToolkit.Maui.UnitTests/CommunityToolkit.Maui.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="FluentAssertions" Version="6.6.0" />
1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
1414
<PackageReference Include="xunit" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

src/CommunityToolkit.Maui.UnitTests/Extensions/BackgroundColorTo_Tests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ public async Task BackgroundColorTo_VerifyColorChangedForDefaultBackgroundColor(
3636
Assert.Equal(updatedBackgroundColor, element.BackgroundColor);
3737
}
3838

39-
[Fact]
40-
public async Task BackgroundColorTo_VerifyFalseWhenAnimationContextNotSet()
41-
{
42-
VisualElement element = new Label();
43-
Assert.Null(element.BackgroundColor);
44-
45-
var isSuccessful = await element.BackgroundColorTo(Colors.Red);
46-
47-
Assert.False(isSuccessful);
48-
Assert.Equal(Colors.Transparent, element.BackgroundColor);
49-
}
50-
5139
[Fact]
5240
public async Task BackgroundColorTo_DoesNotAllowNullVisualElement()
5341
{

src/CommunityToolkit.Maui.UnitTests/Extensions/TextColorTo_Tests.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,6 @@ public async Task LabelTextColorTo_VerifyColorChangedForDefaultBackgroundColor()
6969
Assert.Equal(updatedTextColor, label.TextColor);
7070
}
7171

72-
[Fact]
73-
public async Task LabelTextColorTo_VerifyFalseWhenAnimationContextNotSet()
74-
{
75-
var label = new Label();
76-
Assert.Null(label.TextColor);
77-
78-
var isSuccessful = await label.TextColorTo(Colors.Red);
79-
80-
Assert.False(isSuccessful);
81-
Assert.Equal(Colors.Transparent, label.TextColor);
82-
}
83-
8472
[Fact]
8573
public async Task LabelTextColorTo_DoesNotAllowNullVisualElement()
8674
{

0 commit comments

Comments
 (0)