bump .net5

PrismLibrary · Jan 6, 2021 · b96f862 · b96f862
1 parent 97c3929
commit b96f862
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 39 deletions.
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -75,22 +75,22 @@ stages:
 
   - template: jobs/uno-uitest.yml
 
-  - template: jobs/e2e-uitest.yml
-    parameters:
-      artifactName: E2E-Android
-      e2eJobName: e2eAndroid
-      appFile: 'com.prismlibrary.helloworld.apk'
-      appName: $(AppCenterDroidAppName)
-      devices: $(AppCenterDroidDevices)
-
-  - template: jobs/e2e-uitest.yml
-    parameters:
-      artifactName: E2E-iOS
-      e2eJobName: e2eiOS
-      appFile: 'HelloWorld.iOS.ipa'
-      dsymDirectory: 'HelloWorld.iOS.app.dSYM'
-      appName: $(AppCenteriOSAppName)
-      devices: $(AppCenteriOSDevices)
+  # - template: jobs/e2e-uitest.yml
+  #   parameters:
+  #     artifactName: E2E-Android
+  #     e2eJobName: e2eAndroid
+  #     appFile: 'com.prismlibrary.helloworld.apk'
+  #     appName: $(AppCenterDroidAppName)
+  #     devices: $(AppCenterDroidDevices)
+
+  # - template: jobs/e2e-uitest.yml
+  #   parameters:
+  #     artifactName: E2E-iOS
+  #     e2eJobName: e2eiOS
+  #     appFile: 'HelloWorld.iOS.ipa'
+  #     dsymDirectory: 'HelloWorld.iOS.app.dSYM'
+  #     appName: $(AppCenteriOSAppName)
+  #     devices: $(AppCenteriOSDevices)
 
 - stage: buildPackage
   displayName: Build Prism Library

diff --git a/build/jobs/uno-uitest.yml b/build/jobs/uno-uitest.yml
@@ -9,11 +9,7 @@ jobs:
   workspace:
     clean: all
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 3.1
-    inputs:
-      packageType: 'sdk'
-      useGlobalJson: true
+  - template: ../steps/prepare-build.yml
 
   - bash: |
       build/scripts/wasm-uitest-run.sh
@@ -47,11 +43,7 @@ jobs:
     clean: all
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 3.1
-    inputs:
-      packageType: 'sdk'
-      useGlobalJson: true
+  - template: ../steps/prepare-build.yml
 
   - template: ../steps/set-runtime.yml
 
@@ -88,11 +80,7 @@ jobs:
   workspace:
     clean: all
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 3.1
-    inputs:
-      packageType: 'sdk'
-      useGlobalJson: true
+  - template: ../steps/prepare-build.yml
 
   - template: ../steps/set-runtime.yml
 

diff --git a/build/steps/build.yml b/build/steps/build.yml
@@ -4,11 +4,11 @@ parameters:
   msbuildArguments: '/p:JavaSdkDirectory="$(JAVA_HOME)"'
 
 steps:
-- task: ChocoInstallPackage@1
-  displayName: Install latest VS2019
-  inputs:
-    packageId: 'visualstudio2019buildtools'
-    extraOptions: '--package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US"'
+# - task: ChocoInstallPackage@1
+#   displayName: Install latest VS2019
+#   inputs:
+#     packageId: 'visualstudio2019buildtools'
+#     extraOptions: '--package-parameters "--allWorkloads --includeRecommended --includeOptional --passive --locale en-US"'
 
 - template: prepare-build.yml
   parameters:
@@ -21,5 +21,5 @@ steps:
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
     msbuildArguments: ${{ parameters.msbuildArguments }}
-  env:
-    MSBuildSDKsPath: 'C:\hostedtoolcache\windows\dotnet\sdk\5.0.100\Sdks\'
+  # env:
+  #   MSBuildSDKsPath: 'C:\hostedtoolcache\windows\dotnet\sdk\5.0.100\Sdks\'
diff --git a/build/steps/prepare-build.yml b/build/steps/prepare-build.yml
@@ -2,6 +2,12 @@ parameters:
   solution: '**/*.sln'
 
 steps:
+- task: UseDotNet@2
+  displayName: Ensure 3.1 SDK is Installed
+  inputs:
+    packageType: 'sdk'
+    version: '3.1.404'
+
 - task: UseDotNet@2
   displayName: Use .NET 5.0
   inputs:

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "5.0.101",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   },