Skip to content

ci: Upgrade to net9 #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 11, 2025
Merged

ci: Upgrade to net9 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd7dae3
ci: Upgrade to net9
jeromelaban Feb 11, 2025
959cfd9
chore: Exclude System.Text.Json for net9 compatible VS builds
jeromelaban Feb 11, 2025
e293e55
chore: Adjust file format
jeromelaban Feb 11, 2025
91711ed
chore: Bump to 19041
jeromelaban Feb 11, 2025
a5e2faf
ci: adjust macos tests
jeromelaban Feb 11, 2025
d4b0058
Merge branch 'master' into dev/jela/net9
jeromelaban Feb 11, 2025
5ea3009
chore: remove xamarin versions
jeromelaban Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 24 additions & 55 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
- job: Build_Packages

pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'

variables:
NUGET_PACKAGES: $(Pipeline.Workspace)\.nuget\packages
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
ArtifactName: unosourcegenerator-drop
ArtifactType: Container

- job: Windows_VS2019
- job: Windows_VS2022
dependsOn:
- Build_Packages

Expand All @@ -102,12 +102,15 @@ jobs:
RestoreLockedMode: false # Until https://github.com/NuGet/Home/issues/8645

pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'

strategy:
matrix:
NetCore_8_0_100_Preview:
NETCORE_VERSION: 8.0.100-preview.6.23330.14
NetCore_9_0_100:
NETCORE_VERSION: 9.0.100
NETCORE_PREVIEW: True
NetCore_8_0_100:
NETCORE_VERSION: 8.0.100
NETCORE_PREVIEW: True
NetCore_7_0_306:
NETCORE_VERSION: 7.0.306
Expand Down Expand Up @@ -194,9 +197,12 @@ jobs:

strategy:
matrix:
NetCore_8_0_100_Preview:
NETCORE_VERSION: 8.0.100-preview.6.23330.14
NETCORE_PREVIEW: True
NetCore_9_0_100:
NETCORE_VERSION: 9.0.100
NETCORE_PREVIEW: false
NetCore_8_0_100:
NETCORE_VERSION: 8.0.100
NETCORE_PREVIEW: false
NetCore_7_0_306:
NETCORE_VERSION: 7.0.306
NetCore_6_0_302:
Expand Down Expand Up @@ -305,52 +311,18 @@ jobs:

strategy:
matrix:
Xamarin_6_12_17_NET_8_0_100_Preview:
XamarinVersion: 6_12_17
VM_Image: 'macOS-12'
NETCORE_VERSION: 8.0.100-preview.6.23330.14
NETCORE_PREVIEW: True
# Xamarin is not yet available in macos-13 agents
# Xamarin_6_12_17_NET_8_0_100_Preview_macos13:
# XamarinVersion: 6_12_17
# VM_Image: 'macOS-13'
# NETCORE_VERSION: 8.0.100-preview.6.23330.14
# NETCORE_PREVIEW: True
# Xamarin_6_12_17_NET_7_0_100_macos13:
# XamarinVersion: 6_12_17
# VM_Image: 'macOS-13'
# NETCORE_VERSION: 7.0.306
# NETCORE_PREVIEW: False
Xamarin_6_12_17_NET_7_0_100:
XamarinVersion: 6_12_17
VM_Image: 'macOS-12'
NETCORE_VERSION: 7.0.306
NET_9_0_100:
VM_Image: 'macOS-13'
NETCORE_VERSION: 9.0.100
NETCORE_PREVIEW: False
Xamarin_6_12_16_NET_6_0_302:
XamarinVersion: 6_12_16
VM_Image: 'macOS-11'
NETCORE_VERSION: 6.0.302
NET_8_0_100_Preview_macos13:
VM_Image: 'macOS-13'
NETCORE_VERSION: 8.0.100
NETCORE_PREVIEW: False
Xamarin_6_12_16_NET_6_0_100:
XamarinVersion: 6_12_16
VM_Image: 'macOS-11'
NETCORE_VERSION: 6.0.100
NET_7_0_100_macos13:
VM_Image: 'macOS-13'
NETCORE_VERSION: 7.0.306
NETCORE_PREVIEW: False
Xamarin_6_12_0_NetCore_5_0:
XamarinVersion: 6_12_0
VM_Image: 'macOS-11'
NETCORE_VERSION: 5.0.x
NETCORE_PREVIEW: False
Xamarin_6_12_0_NetCore_3_1:
XamarinVersion: 6_12_0
VM_Image: 'macOS-11'
NETCORE_VERSION: 3.1.x
NETCORE_PREVIEW: False
Xamarin_6_12_0_NetCore_3_0:
XamarinVersion: 6_12_0
VM_Image: 'macOS-11'
NETCORE_VERSION: 3.1.x
NETCORE_PREVIEW: False

pool:
vmImage: $(VM_Image)
Expand Down Expand Up @@ -406,10 +378,7 @@ jobs:
includePreviewVersions: $(NETCORE_PREVIEW)
installationPath: $(Agent.ToolsDirectory)/dotnet

- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinVersion)"
displayName: Select Xamarin Version

- bash: msbuild /r /p:Configuration=Release /p:SOURCEGEN_VERSION=$(GITVERSION.SemVer) /p:SAMPLES_BUILD=true ./src/Uno.SourceGenerator.Samples.Unix.sln /bl:$(build.artifactstagingdirectory)/binlog/macos-sample-build-$(XamarinVersion).binlog
- bash: dotnet build -c Release /p:SOURCEGEN_VERSION=$(GITVERSION.SemVer) /p:SAMPLES_BUILD=true ./src/Uno.SourceGenerator.Samples.Unix.sln /bl:$(build.artifactstagingdirectory)/binlog/macos-sample-build-$(XamarinVersion).binlog
displayName: Build

- bash: |
Expand Down
6 changes: 3 additions & 3 deletions build/Uno.SourceGenerationTasks.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<repository url="https://github.com/nventive/Uno.SourceGeneration" />
</metadata>
<files>
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.dll" target="build\Dev15.0\net472" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.pdb" target="build\Dev15.0\net472" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.dll" target="build\Dev15.0\net472" exclude="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\System.Text.Json.dll" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.pdb" target="build\Dev15.0\net472" exclude="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\System.Text.Json.pdb" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\*.config" target="build\Dev15.0\net472" />

<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\netcoreapp3.1\**\*.dll" target="build\Dev15.0\netcoreapp3.1" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\netcoreapp3.1\**\*.pdb" target="build\Dev15.0\netcoreapp3.1" />
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\netcoreapp3.1\*.config" target="build\Dev15.0\netcoreapp3.1" />

<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net472\**\*.*" target="build\host\net472" />
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net472\**\*.*" target="build\host\net472" exclude="..\src\Uno.SourceGeneration.Host\bin\Release\net472\**\System.Text.Json.dll" />
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\netcoreapp3.1\**\*.*" target="build\host\netcoreapp3.1" />
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net5\**\*.*" target="build\host\net5" />
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net6\**\*.*" target="build\host\net6" />
Expand Down
4 changes: 2 additions & 2 deletions src/Uno.SampleProject.UWP/Uno.SampleProject.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<AssemblyName>Uno.SampleProject.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down
Loading