Skip to content

Commit 0dc3934

Browse files
jeromelabanjeromelaban
authored
Merge pull request #162 from unoplatform/dev/jela/net9
ci: Upgrade to net9
2 parents b9a5251 + 5ea3009 commit 0dc3934

File tree

3 files changed

+29
-60
lines changed

3 files changed

+29
-60
lines changed

‎.vsts-ci.yml

Lines changed: 24 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ jobs:
22
- job: Build_Packages
33

44
pool:
5-
vmImage: 'windows-2019'
5+
vmImage: 'windows-2022'
66

77
variables:
88
NUGET_PACKAGES: $(Pipeline.Workspace)\.nuget\packages
@@ -92,7 +92,7 @@ jobs:
9292
ArtifactName: unosourcegenerator-drop
9393
ArtifactType: Container
9494

95-
- job: Windows_VS2019
95+
- job: Windows_VS2022
9696
dependsOn:
9797
- Build_Packages
9898

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

104104
pool:
105-
vmImage: 'windows-2019'
105+
vmImage: 'windows-2022'
106106

107107
strategy:
108108
matrix:
109-
NetCore_8_0_100_Preview:
110-
NETCORE_VERSION: 8.0.100-preview.6.23330.14
109+
NetCore_9_0_100:
110+
NETCORE_VERSION: 9.0.100
111+
NETCORE_PREVIEW: True
112+
NetCore_8_0_100:
113+
NETCORE_VERSION: 8.0.100
111114
NETCORE_PREVIEW: True
112115
NetCore_7_0_306:
113116
NETCORE_VERSION: 7.0.306
@@ -194,9 +197,12 @@ jobs:
194197

195198
strategy:
196199
matrix:
197-
NetCore_8_0_100_Preview:
198-
NETCORE_VERSION: 8.0.100-preview.6.23330.14
199-
NETCORE_PREVIEW: True
200+
NetCore_9_0_100:
201+
NETCORE_VERSION: 9.0.100
202+
NETCORE_PREVIEW: false
203+
NetCore_8_0_100:
204+
NETCORE_VERSION: 8.0.100
205+
NETCORE_PREVIEW: false
200206
NetCore_7_0_306:
201207
NETCORE_VERSION: 7.0.306
202208
NetCore_6_0_302:
@@ -305,52 +311,18 @@ jobs:
305311

306312
strategy:
307313
matrix:
308-
Xamarin_6_12_17_NET_8_0_100_Preview:
309-
XamarinVersion: 6_12_17
310-
VM_Image: 'macOS-12'
311-
NETCORE_VERSION: 8.0.100-preview.6.23330.14
312-
NETCORE_PREVIEW: True
313-
# Xamarin is not yet available in macos-13 agents
314-
# Xamarin_6_12_17_NET_8_0_100_Preview_macos13:
315-
# XamarinVersion: 6_12_17
316-
# VM_Image: 'macOS-13'
317-
# NETCORE_VERSION: 8.0.100-preview.6.23330.14
318-
# NETCORE_PREVIEW: True
319-
# Xamarin_6_12_17_NET_7_0_100_macos13:
320-
# XamarinVersion: 6_12_17
321-
# VM_Image: 'macOS-13'
322-
# NETCORE_VERSION: 7.0.306
323-
# NETCORE_PREVIEW: False
324-
Xamarin_6_12_17_NET_7_0_100:
325-
XamarinVersion: 6_12_17
326-
VM_Image: 'macOS-12'
327-
NETCORE_VERSION: 7.0.306
314+
NET_9_0_100:
315+
VM_Image: 'macOS-13'
316+
NETCORE_VERSION: 9.0.100
328317
NETCORE_PREVIEW: False
329-
Xamarin_6_12_16_NET_6_0_302:
330-
XamarinVersion: 6_12_16
331-
VM_Image: 'macOS-11'
332-
NETCORE_VERSION: 6.0.302
318+
NET_8_0_100_Preview_macos13:
319+
VM_Image: 'macOS-13'
320+
NETCORE_VERSION: 8.0.100
333321
NETCORE_PREVIEW: False
334-
Xamarin_6_12_16_NET_6_0_100:
335-
XamarinVersion: 6_12_16
336-
VM_Image: 'macOS-11'
337-
NETCORE_VERSION: 6.0.100
322+
NET_7_0_100_macos13:
323+
VM_Image: 'macOS-13'
324+
NETCORE_VERSION: 7.0.306
338325
NETCORE_PREVIEW: False
339-
Xamarin_6_12_0_NetCore_5_0:
340-
XamarinVersion: 6_12_0
341-
VM_Image: 'macOS-11'
342-
NETCORE_VERSION: 5.0.x
343-
NETCORE_PREVIEW: False
344-
Xamarin_6_12_0_NetCore_3_1:
345-
XamarinVersion: 6_12_0
346-
VM_Image: 'macOS-11'
347-
NETCORE_VERSION: 3.1.x
348-
NETCORE_PREVIEW: False
349-
Xamarin_6_12_0_NetCore_3_0:
350-
XamarinVersion: 6_12_0
351-
VM_Image: 'macOS-11'
352-
NETCORE_VERSION: 3.1.x
353-
NETCORE_PREVIEW: False
354326

355327
pool:
356328
vmImage: $(VM_Image)
@@ -406,10 +378,7 @@ jobs:
406378
includePreviewVersions: $(NETCORE_PREVIEW)
407379
installationPath: $(Agent.ToolsDirectory)/dotnet
408380

409-
- bash: /bin/bash -c "sudo $AGENT_HOMEDIRECTORY/scripts/select-xamarin-sdk.sh $(XamarinVersion)"
410-
displayName: Select Xamarin Version
411-
412-
- 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
381+
- 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
413382
displayName: Build
414383

415384
- bash: |

‎build/Uno.SourceGenerationTasks.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
<repository url="https://github.com/nventive/Uno.SourceGeneration" />
1515
</metadata>
1616
<files>
17-
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.dll" target="build\Dev15.0\net472" />
18-
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\**\*.pdb" target="build\Dev15.0\net472" />
17+
<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" />
18+
<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" />
1919
<file src="..\src\Uno.SourceGeneratorTasks.Dev15.0\Bin\Release\net472\*.config" target="build\Dev15.0\net472" />
2020

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

25-
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net472\**\*.*" target="build\host\net472" />
25+
<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" />
2626
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\netcoreapp3.1\**\*.*" target="build\host\netcoreapp3.1" />
2727
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net5\**\*.*" target="build\host\net5" />
2828
<file src="..\src\Uno.SourceGeneration.Host\bin\Release\net6\**\*.*" target="build\host\net6" />

‎src/Uno.SampleProject.UWP/Uno.SampleProject.UWP.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>Uno.SampleProject.UWP</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

0 commit comments

Comments
 (0)