Skip to content
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.

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

ci: Update to net9 rtm #1178

Merged
merged 8 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/azure-static-webapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 3 additions & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ stages:
ApplicationBuildNumberOffset: 50
BuildCommand: build
pool:
vmImage: macos-14
vmImage: macos-15

variables:
- name: SkipUnknownFrameworks
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 2 additions & 4 deletions build/build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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) -->
Expand Down
4 changes: 2 additions & 2 deletions build/stage-build-android-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions build/stage-build-mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion build/stage-build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion build/templates/canary-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
8 changes: 4 additions & 4 deletions build/templates/dotnet-install-linux.yml
Original file line number Diff line number Diff line change
@@ -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: ''
Expand All @@ -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') ))
6 changes: 3 additions & 3 deletions build/templates/dotnet-install-mac.yml
Original file line number Diff line number Diff line change
@@ -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: ''

Expand Down Expand Up @@ -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') ))
6 changes: 3 additions & 3 deletions build/templates/dotnet-install-windows.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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'))
5 changes: 1 addition & 4 deletions build/templates/set-app-versions.yml
Original file line number Diff line number Diff line change
@@ -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
Loading