Merge pull request #1178 from unoplatform/dev/jela/net9rtm

ci: Update to net9 rtm
unoplatform · Nov 13, 2024 · 1869609 · 1869609
2 parents b753d73 + fcbe82c
commit 1869609
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 27 deletions.
diff --git a/.github/workflows/azure-static-webapp.yml b/.github/workflows/azure-static-webapp.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Setup .NET
         uses: actions/[email protected]
         with:
-          dotnet-version: '9.0.100-rc.2.24474.11'
+          dotnet-version: '9.0.100'
           include-prerelease: true
 
       - run: |

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -132,7 +132,7 @@ stages:
           ApplicationBuildNumberOffset: 50
           BuildCommand: build
     pool:
-      vmImage: macos-14
+      vmImage: macos-15
 
     variables:
     - name: SkipUnknownFrameworks
@@ -145,6 +145,7 @@ stages:
       inputs:
         certSecureFile: UnoPlatform-Apple-Distribution.p12
         certPwd: $(appleappstorecertificatepassword)
+        opensslPkcsArgs: -legacy
         keychain: temp
         # disabled because of azure devops failing to uninstall as of 2022-11-16
         # deleteCert: true
@@ -154,6 +155,7 @@ stages:
       inputs:
         certSecureFile: UnoPlatform-MacInstaller.p12
         certPwd: $(appleappstorecertificatepassword)
+        opensslPkcsArgs: -legacy
         keychain: temp
         # disabled because of azure devops failing to uninstall as of 2022-11-16
         # deleteCert: true

diff --git a/build/build.csproj b/build/build.csproj
@@ -131,16 +131,14 @@
 	</Target>
 
 	<UsingTask TaskName="_XmlUpdate"
-                       TaskFactory="CodeTaskFactory"
-                       AssemblyFile="$(MSBuildToolsPath)/Microsoft.Build.Tasks.v12.0.dll" >
+			   TaskFactory="RoslynCodeTaskFactory"
+			   AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
 		<ParameterGroup>
 			<XmlFileName Required="True" />
 			<XPath Required="True" />
 			<Value Required="True" />
 		</ParameterGroup>
 		<Task>
-			<Reference Include="System.Xml" />
-			<Reference Include="System.Xml.Linq" />
 			<Using Namespace="System"/>
 			<Using Namespace="System.Xml.XPath"/>
 			<!-- The following code is from the MSBuildTasks library (https://github.com/loresoft/msbuildtasks/blob/6196d43e7eb6807f306e9861b286fe61c8bb0993/Source/MSBuild.Community.Tasks/XmlUpdate.cs) -->

diff --git a/build/stage-build-android-mobile.yml b/build/stage-build-android-mobile.yml
@@ -17,13 +17,13 @@ steps:
     cd $(build.sourcesdirectory)/Uno.Gallery
     dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidSigningKeyStore=$(keyStore.secureFilePath) /p:AndroidSigningStorePass=$(AndroidSigningStorePass) /p:AndroidSigningKeyPass=$(AndroidSigningKeyPass) /p:AndroidSigningKeyAlias=$(AndroidSigningKeyAlias) /p:AndroidKeyStore=true /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
   displayName: 'Build Android Package'
-  condition: eq(variables['System.PullRequest.IsFork'],'False')
+  condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False'))
 
 - script: |
     cd $(build.sourcesdirectory)/Uno.Gallery
     dotnet publish -f:net9.0-android -p:TargetFrameworkOverride=net9.0-android -c:Release "/p:InformationalVersion=$(GitVersion.InformationalVersion)" /p:AndroidKeyStore=False /bl:$(build.artifactstagingdirectory)/build-$(BuildForPlayStore).binlog
   displayName: 'Build Android Package (Fork)'
-  condition: eq(variables['System.PullRequest.IsFork'],'True')
+  condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True'))
 
 - task: CopyFiles@2
   displayName: 'Publish Android netcore Binaries'

diff --git a/build/stage-build-mobile.yml b/build/stage-build-mobile.yml
@@ -16,7 +16,7 @@ steps:
     secureFile: nventive.jks
 
 - task: UseDotNet@2
-  condition: eq(variables['IsCanaryBranch'], true)
+  condition: and(succeeded(), eq(variables['IsCanaryBranch'], true))
   retryCountOnTaskFailure: 3
   inputs:
     packageType: runtime
@@ -29,14 +29,14 @@ steps:
     echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
     dotnet $(BuildCommand) -v:n -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /p:ArchiveOnBuild=true /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
   displayName: Build project for Release - $(BuildTargetFramework)
-  condition: eq(variables['System.PullRequest.IsFork'],'False')
+  condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'False'))
 
 - bash: |
     cd $(build.sourcesdirectory)/Uno.Gallery
     echo "BUILD_SOURCEBRANCH: $BUILD_SOURCEBRANCH"
     dotnet build -f $(BuildTargetFramework) -p:TargetFrameworkOverride=$(BuildTargetFramework) -c Release /bl:$(build.artifactstagingdirectory)/build-$(BuildTargetFramework).binlog "/p:InformationalVersion=$(GitVersion.InformationalVersion)"
   displayName: Build project for Release - $(BuildTargetFramework)
-  condition: eq(variables['System.PullRequest.IsFork'],'True')
+  condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'],'True'))
 
 - task: CopyFiles@2
   displayName: 'Publish Binaries'

diff --git a/build/stage-build-windows.yml b/build/stage-build-windows.yml
@@ -14,7 +14,7 @@ steps:
   displayName: 'Use .NET'
   inputs:
     packageType: 'sdk'
-    version: '9.0.100-rc.2.24474.11'
+    version: '9.0.100'
     includePreviewVersions: true
 
 - script: |

diff --git a/build/templates/canary-updater.yml b/build/templates/canary-updater.yml
@@ -4,7 +4,7 @@ steps:
     displayName: 'Use .NET'
     inputs:
       packageType: 'sdk'
-      version: '8.0.301'
+      version: '9.0.100'
 
   - task: nventiveCanaryUpdater@5
     displayName: 'Canary Update (dev)'

diff --git a/build/templates/dotnet-install-linux.yml b/build/templates/dotnet-install-linux.yml
@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.100-rc.2.24474.11'
-  UnoCheck_Version: '1.27.0-dev.4'
+  DotNetVersion: '9.0.100'
+  UnoCheck_Version: '1.27.0-dev.8'
   installJava: true
   installWorkloads: true
   UnoCheckParameters: ''
@@ -24,10 +24,10 @@ steps:
       sudo update-java-alternatives --set msopenjdk-11-amd64
     displayName: Install OpenJDK 11
     retryCountOnTaskFailure: 3
-    condition: eq('${{ parameters.installJava }}', 'true')
+    condition: and(succeeded(), eq('${{ parameters.installJava }}', 'true'))
 
   - bash: |
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
       uno-check --verbose --ci --non-interactive --fix --skip gtk3 --skip androidsdk --pre-major ${{ parameters.UnoCheckParameters }}
     displayName: Install .NET Workloads
-    condition: and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') )
+    condition: and(succeeded(), and( eq(variables['Agent.OS'], 'Linux'), eq('${{ parameters.installWorkloads }}', 'true') ))
diff --git a/build/templates/dotnet-install-mac.yml b/build/templates/dotnet-install-mac.yml
@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.100-rc.2.24474.11'
-  UnoCheck_Version: '1.27.0-dev.4'
+  DotNetVersion: '9.0.100'
+  UnoCheck_Version: '1.27.0-dev.8'
   installWorkloads: true
   UnoCheckParameters: ''
 
@@ -31,4 +31,4 @@ steps:
       dotnet tool update --global uno.check --version ${{ parameters.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
       uno-check --ci --non-interactive --fix --skip gtk3 --skip xcode --skip vswin --skip androidemulator --skip vsmac --pre-major ${{ parameters.UnoCheckParameters }}
     displayName: Install .NET Workloads
-    condition: and( eq(variables['Agent.OS'], 'Darwin'), eq('${{ parameters.installWorkloads }}', 'true') )
+    condition: and(succeeded(), and( eq(variables['Agent.OS'], 'Darwin'), eq('${{ parameters.installWorkloads }}', 'true') ))
diff --git a/build/templates/dotnet-install-windows.yml b/build/templates/dotnet-install-windows.yml
@@ -1,6 +1,6 @@
 parameters:
-  DotNetVersion: '9.0.100-rc.2.24474.11'
-  UnoCheck_Version: '1.27.0-dev.4'
+  DotNetVersion: '9.0.100'
+  UnoCheck_Version: '1.27.0-dev.8'
   UnoCheckParameters: ''
 
 steps:
@@ -31,4 +31,4 @@ steps:
     errorActionPreference: continue
     ignoreLASTEXITCODE: true
     retryCountOnTaskFailure: 3
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
+    condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
diff --git a/build/templates/set-app-versions.yml b/build/templates/set-app-versions.yml
@@ -1,7 +1,4 @@
 steps:
 
-  - task: MSBuild@1
+  - pwsh: dotnet build $(Build.SourcesDirectory)/build/build.csproj /t:BuildVersion /bl:$(Build.ArtifactStagingDirectory)/set-version-build.binlog
     displayName: Update app versions
-    inputs:
-      solution: '$(build.sourcesdirectory)/build/build.csproj'
-      msbuildArguments: /r /t:BuildVersion /bl:$(build.artifactstagingdirectory)/set-version-build.binlog