File tree Expand file tree Collapse file tree 4 files changed +17
-11
lines changed
common/templates-official/job
tests/Install-Scripts.Test Expand file tree Collapse file tree 4 files changed +17
-11
lines changed Original file line number Diff line number Diff line change 33 <ProductDependencies >
44 </ProductDependencies >
55 <ToolsetDependencies >
6- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.25366.2 " >
6+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 8.0.0-beta.25378.1 " >
77 <Uri >https://github.com/dotnet/arcade</Uri >
8- <Sha >a73c08ec0de5a6e5e2a8668837df67edecb3a3da </Sha >
8+ <Sha >8dca4f8ae100b102230287f8cc1b75264c9f1a6f </Sha >
99 </Dependency >
10- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.25366.2 " >
10+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 8.0.0-beta.25378.1 " >
1111 <Uri >https://github.com/dotnet/arcade</Uri >
12- <Sha >a73c08ec0de5a6e5e2a8668837df67edecb3a3da </Sha >
12+ <Sha >8dca4f8ae100b102230287f8cc1b75264c9f1a6f </Sha >
1313 </Dependency >
1414 </ToolsetDependencies >
1515</Dependencies >
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ parameters:
2121 # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222 artifacts : ' '
2323 enableMicrobuild : false
24+ microbuildUseESRP : true
2425 enablePublishBuildArtifacts : false
2526 enablePublishBuildAssets : false
2627 enablePublishTestResults : false
@@ -135,10 +136,11 @@ jobs:
135136 signType : $(_SignType)
136137 zipSources : false
137138 feedSource : https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }} :
139- ConnectedPMEServiceName : 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
140- ${{ else }} :
141- ConnectedPMEServiceName : 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
139+ ${{ if eq(parameters.microbuildUseESRP, true) }} :
140+ ${{ if eq(variables['System.TeamProject'], 'DevDiv') }} :
141+ ConnectedPMEServiceName : 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+ ${{ else }} :
143+ ConnectedPMEServiceName : 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
142144 env :
143145 TeamName : $(_TeamName)
144146 MicroBuildOutputFolderOverride : ' $(Agent.TempDirectory)'
Original file line number Diff line number Diff line change 33 "dotnet" : " 8.0.117"
44 },
55 "msbuild-sdks" : {
6- "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.25366.2 " ,
7- "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.25366.2 "
6+ "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.25378.1 " ,
7+ "Microsoft.DotNet.Helix.Sdk" : " 8.0.0-beta.25378.1 "
88 }
99}
Original file line number Diff line number Diff line change @@ -205,6 +205,10 @@ public void Dispose()
205205 {
206206 // Directory to cleanup may not be there if installation fails. Not an issue. Ignore the exception.
207207 }
208+ catch ( UnauthorizedAccessException e )
209+ {
210+ throw new Exception ( $ "Failed to remove { _sdkInstallationDirectory } ") ;
211+ }
208212 }
209213
210214 [ Theory ]
@@ -663,4 +667,4 @@ private static IEnumerable<string> GetQualityOptionsFromFlags(Quality flags)
663667 }
664668 }
665669 }
666- }
670+ }
You can’t perform that action at this time.
0 commit comments