浏览代码

Merge remote-tracking branch 'upstream/master' into move-sdk-to-7.0.101

Simon 2 年之前
父节点
当前提交
d3f329cde3
共有 2 个文件被更改,包括 10 次插入10 次删除
  1. 4 4
      azure-pipelines-integrationtests.yml
  2. 6 6
      azure-pipelines.yml

+ 4 - 4
azure-pipelines-integrationtests.yml

@@ -13,9 +13,9 @@ jobs:
 
 
   steps:
   steps:
   - task: UseDotNet@2
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
 
   - task: UseDotNet@2
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 7.0.101'
     displayName: 'Use .NET Core SDK 7.0.101'
@@ -51,9 +51,9 @@ jobs:
 
 
   steps:
   steps:
   - task: UseDotNet@2
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
 
   - task: UseDotNet@2
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 7.0.101'
     displayName: 'Use .NET Core SDK 7.0.101'

+ 6 - 6
azure-pipelines.yml

@@ -30,9 +30,9 @@ jobs:
     vmImage: 'ubuntu-20.04'
     vmImage: 'ubuntu-20.04'
   steps:
   steps:
   - task: UseDotNet@2
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
 
   - task: UseDotNet@2
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 7.0.101'
     displayName: 'Use .NET Core SDK 7.0.101'
@@ -67,9 +67,9 @@ jobs:
     vmImage: 'macos-12'
     vmImage: 'macos-12'
   steps:
   steps:
   - task: UseDotNet@2
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
 
   - task: UseDotNet@2
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 7.0.101'
     displayName: 'Use .NET Core SDK 7.0.101'
@@ -138,9 +138,9 @@ jobs:
     SolutionDir: '$(Build.SourcesDirectory)'
     SolutionDir: '$(Build.SourcesDirectory)'
   steps:
   steps:
   - task: UseDotNet@2
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 6.0.401'
+    displayName: 'Use .NET Core SDK 6.0.404'
     inputs:
     inputs:
-      version: 6.0.401
+      version: 6.0.404
 
 
   - task: UseDotNet@2
   - task: UseDotNet@2
     displayName: 'Use .NET Core SDK 7.0.101'
     displayName: 'Use .NET Core SDK 7.0.101'