Merge pull request #10122 from Youssef1313/pin-sdk

Use .NET 7 SDK
unoplatform · Feb 15, 2023 · 7a1c3c3 · 7a1c3c3
2 parents e835c7e + 34c6f31
commit 7a1c3c3
Show file tree

Hide file tree

Showing 33 changed files with 92 additions and 309 deletions.
diff --git a/build/Uno.UI.Build.csproj b/build/Uno.UI.Build.csproj
@@ -5,10 +5,6 @@
 		<UpdateAssemblyInfo>false</UpdateAssemblyInfo>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<Content Include="..\src\global.json" Link="global.json" />
-	</ItemGroup>
-
 	<PropertyGroup Condition="'$(BuildingInsideVisualStudio)'==''">
 		<AppVersion>$(GITVERSION_SemVer)</AppVersion>
 

diff --git a/build/ci/.azure-devops-android-tests.yml b/build/ci/.azure-devops-android-tests.yml
@@ -209,8 +209,6 @@ jobs:
         artifactName: uitests-failure-results
         downloadPath: '$(build.sourcesdirectory)/build'
 
-  - template: templates/optimize-roslyn-mono.yml
-
   - template: templates/dotnet-install.yml
 
   - template: templates/ios-build-select-version.yml

diff --git a/build/ci/.azure-devops-ios-tests-run.yml b/build/ci/.azure-devops-ios-tests-run.yml
@@ -53,7 +53,6 @@ jobs:
         downloadPath: '$(build.sourcesdirectory)/build'
 
   - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - template: templates/nuget-cache.yml
     parameters:

diff --git a/build/ci/.azure-devops-ios-tests.yml b/build/ci/.azure-devops-ios-tests.yml
@@ -41,7 +41,6 @@ jobs:
       nugetPackages: $(NUGET_PACKAGES)
 
   - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - template: templates/ios-build-select-version.yml
     parameters:

diff --git a/build/ci/.azure-devops-macos.yml b/build/ci/.azure-devops-macos.yml
@@ -13,7 +13,7 @@ jobs:
     SourceLinkEnabled: false
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
     XCODE_ROOT: /Applications/Xcode_10.3.app
-    
+
   dependsOn: Pipeline_Validations
 
   pool:
@@ -22,9 +22,8 @@ jobs:
   steps:
   - checkout: self
     clean: true
-    
+
   - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - template: templates/nuget-cache.yml
     parameters:
@@ -79,7 +78,7 @@ jobs:
     CI_Build: true
     SourceLinkEnabled: false
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-  
+
   dependsOn: macOS
 
   pool:
@@ -88,9 +87,6 @@ jobs:
   steps:
   - checkout: none
     clean: true
-
-  - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - task: DownloadBuildArtifacts@0
     inputs:
@@ -103,18 +99,18 @@ jobs:
       targetType: inline
       script: |
         brew install coreutils
-  
+
   - script: |
         cd $(build.sourcesdirectory)/build/uno-macos-artifacts
         installer -pkg SamplesApp.macOS-1.0.pkg -target CurrentUserHomeDirectory
-    
+
     displayName: Install SamplesApp
 
   - script: |
       timeout 70m /Applications/SamplesApp.macOS.app/Contents/MacOS/SamplesApp.macOS --runtime-tests=$(build.sourcesdirectory)/build/macOS-runtime-tests-results.xml
 
     displayName: Run macOS Runtime Tests
-  
+
   - task: PublishTestResults@2
     displayName: Publish macOS Runtime Tests
     condition: always()
@@ -132,7 +128,7 @@ jobs:
     CI_Build: true
     SourceLinkEnabled: false
     NUGET_PACKAGES: $(build.sourcesdirectory)/.nuget
-  
+
   dependsOn: macOS
 
   pool:
@@ -141,15 +137,12 @@ jobs:
   steps:
   - checkout: none
     clean: true
-
-  - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - task: DownloadBuildArtifacts@0
     inputs:
         artifactName: uno-macos-artifacts
         downloadPath: '$(build.sourcesdirectory)/build'
-  
+
   - task: PowerShell@2
     displayName: 'Install coreutils'
     inputs:
@@ -160,7 +153,7 @@ jobs:
   - script: |
         cd $(build.sourcesdirectory)/build/uno-macos-artifacts
         installer -pkg SamplesApp.macOS-1.0.pkg -target CurrentUserHomeDirectory
-    
+
     displayName: Install SamplesApp
 
   - script: |

diff --git a/build/ci/.azure-devops-package-generic.yml b/build/ci/.azure-devops-package-generic.yml
@@ -48,13 +48,6 @@ jobs:
       versionSpec: 4.9.1
       checkLatest: false
 
-  # Required to run the api comparison tool
-  - task: UseDotNet@2
-    displayName: 'Use .Net Core runtime 2.2.x'
-    inputs:
-      packageType: runtime
-      version: 2.2.x
-
   - template: templates/dotnet-install.yml
 
   - powershell: .\build\Install-WindowsSdkISO.ps1 18362

diff --git a/build/ci/.azure-devops-package-net6-win.yml b/build/ci/.azure-devops-package-net6-win.yml
@@ -65,14 +65,15 @@ jobs:
 
   - template: templates/gitversion.yml
 
-  - template: templates/dotnet6-mobile-install-windows.yml
-  - template: templates/dotnet7-mobile-install-windows.yml
+  - script: |
+      cp global.json global-net7.json
+      cp global-net6.json global.json
+    displayName: Replace global.json with .NET 6
+    condition: and(succeeded(), eq(variables.UnoDisableNet7Mobile, 'true'))
 
-  - template: templates/install-windows-sdk.yml
+  - template: templates/dotnet-mobile-install-windows.yml
 
-  - powershell: |
-        cp $(build.sourcesdirectory)\src\global-netcoremobile.json $(build.sourcesdirectory)\src\global.json
-    displayName: Change active .NET SDK
+  - template: templates/install-windows-sdk.yml
 
   # This task is required to run in separately to avoid hitting targets file
   # caching issues with msbuild 17.3 or later

diff --git a/build/ci/.azure-devops-package.yml b/build/ci/.azure-devops-package.yml
@@ -68,6 +68,8 @@ jobs:
       cleanDestinationFolder: false
       overwriteExistingFiles: true
 
+  - template: templates/dotnet-install.yml
+
   - task: MSBuild@1
     inputs:
       solution: Build/Uno.UI.Build.csproj

diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/.azure-devops-project-template-tests.yml
@@ -20,6 +20,7 @@ jobs:
       artifactName: NugetPackages
 
   - template: templates/gitversion.yml
+  - template: templates/dotnet-install.yml
   - template: templates/jdk-setup.yml
 
   - template: templates/install-windows-sdk.yml
@@ -51,11 +52,7 @@ jobs:
 
   - template: templates/gitversion.yml
 
-  # required to get the WinAppSdk build running, as it depends on
-  # msbuild (and not `dotnet`), and VS 17.3 only supports building for .NET 6.
-  - template: templates/dotnet-install.yml
-
-  - template: templates/dotnet7-mobile-install-windows.yml
+  - template: templates/dotnet-mobile-install-windows.yml
 
   - template: templates/install-windows-sdk.yml
     parameters:
@@ -92,10 +89,7 @@ jobs:
   - script: cp $(System.ArtifactsDirectory)/NugetPackages/vslatest/*.nupkg $(Build.SourcesDirectory)/src/PackageCache
     displayName: Copy Artifacts to PackageCache
 
-  - task: UseDotNet@2
-    inputs:
-      packageType: sdk
-      version: 5.0.102
+  - template: templates/dotnet-install.yml
 
   - script: dotnet new -i $(System.ArtifactsDirectory)/NugetPackages/vslatest/Uno.ProjectTemplates.Dotnet*.nupkg
     displayName: Install Project Templates

diff --git a/build/ci/.azure-devops-uap.yml b/build/ci/.azure-devops-uap.yml
@@ -25,6 +25,7 @@ jobs:
       nugetPackages: $(NUGET_PACKAGES)
 
   - template: templates/gitversion.yml
+  - template: templates/dotnet-install.yml
 
   # Required until Uno.Xaml can build without all targets enabled
   - template: templates/jdk-setup.yml

diff --git a/build/ci/.azure-devops-vs2022-vsix.yml b/build/ci/.azure-devops-vs2022-vsix.yml
@@ -23,6 +23,8 @@ jobs:
 
   - template: templates/gitversion.yml
 
+  - template: templates/dotnet-install.yml
+
   - template: templates/nuget-cache.yml
     parameters:
       nugetPackages: $(NUGET_PACKAGES)

diff --git a/build/ci/.azure-devops-wasm-uitests.yml b/build/ci/.azure-devops-wasm-uitests.yml
@@ -36,8 +36,7 @@ jobs:
   - template: templates/nuget-cache.yml
     parameters:
       nugetPackages: $(NUGET_PACKAGES)
-
-  - template: templates/optimize-roslyn-mono.yml
+
   - template: templates/dotnet-install.yml
 
   - bash: |
@@ -97,7 +96,6 @@ jobs:
         downloadPath: '$(build.sourcesdirectory)/build'
 
   - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - bash: |
       set -euo pipefail
@@ -209,7 +207,6 @@ jobs:
     clean: true
 
   - template: templates/dotnet-install.yml
-  - template: templates/optimize-roslyn-mono.yml
 
   - template: templates/nuget-cache.yml
     parameters:

diff --git a/build/ci/.azure-devops-winui-convert.yml b/build/ci/.azure-devops-winui-convert.yml
@@ -6,7 +6,7 @@ jobs:
   displayName: 'WinUI Converted Tree Generation'
 
   pool: ${{ parameters.poolName }}
-  
+
   dependsOn: Pipeline_Validations
 
   variables:
@@ -17,7 +17,7 @@ jobs:
     NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
 
     UNO_UWP_BUILD: false
-    XAML_FLAVOR_BUILD: WinUI 
+    XAML_FLAVOR_BUILD: WinUI
 
   steps:
   - checkout: self
@@ -27,8 +27,7 @@ jobs:
     parameters:
       nugetPackages: $(NUGET_PACKAGES)
 
-  - template: templates/dotnet7-mobile-install-windows.yml
-  - template: templates/dotnet-install.yml
+  - template: templates/dotnet-mobile-install-windows.yml
   - template: templates/install-windows-sdk.yml
 
   - powershell: |

diff --git a/build/ci/templates/dotnet-install.yml b/build/ci/templates/dotnet-install.yml
@@ -1,16 +1,9 @@
 steps:
 
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
-    retryCountOnTaskFailure: 3
-    inputs:
-      packageType: sdk
-      version: 6.0.401
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 7.0.102'
+    displayName: 'Use .NET SDK'
     retryCountOnTaskFailure: 3
     inputs:
       packageType: sdk
+      useGlobalJson: true
       includePreviewVersions: true
-      version: 7.0.102
diff --git a/build/ci/templates/dotnet-mobile-install-windows.yml b/build/ci/templates/dotnet-mobile-install-windows.yml
@@ -0,0 +1,23 @@
+steps:
+
+  - template: dotnet-install.yml
+
+  - template: jdk-setup.yml
+
+  - powershell: |
+      & dotnet tool update --global uno.check --version 1.5.4 --add-source https://api.nuget.org/v3/index.json
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest https://raw.githubusercontent.com/unoplatform/uno.check/34b1a60f5c1c51604b47362781969dde46979fd5/manifests/uno.ui.manifest.json
+    displayName: Install .NET Workloads
+    errorActionPreference: continue
+    ignoreLASTEXITCODE: true
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), eq(variables.UnoDisableNet7Mobile, 'true'))
+
+  - powershell: |
+      & dotnet tool update --global uno.check --version 1.11.0-dev.2 --add-source https://api.nuget.org/v3/index.json
+      & uno-check -v --ci --non-interactive --fix --skip xcode --skip gtk3 --skip vswin --skip vsmac --manifest https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json
+    displayName: Install .NET Workloads
+    errorActionPreference: continue
+    ignoreLASTEXITCODE: true
+    retryCountOnTaskFailure: 3
+    condition: and(succeeded(), ne(variables.UnoDisableNet7Mobile, 'true'))
diff --git a/build/ci/templates/dotnet6-mobile-install-mac.yml b/build/ci/templates/dotnet6-mobile-install-mac.yml