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 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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 " >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >a73c08ec0de5a6e5e2a8668837df67edecb3a3da </Sha >
8
+ <Sha >8dca4f8ae100b102230287f8cc1b75264c9f1a6f </Sha >
9
9
</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 " >
11
11
<Uri >https://github.com/dotnet/arcade</Uri >
12
- <Sha >a73c08ec0de5a6e5e2a8668837df67edecb3a3da </Sha >
12
+ <Sha >8dca4f8ae100b102230287f8cc1b75264c9f1a6f </Sha >
13
13
</Dependency >
14
14
</ToolsetDependencies >
15
15
</Dependencies >
Original file line number Diff line number Diff line change @@ -21,6 +21,7 @@ parameters:
21
21
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
22
22
artifacts : ' '
23
23
enableMicrobuild : false
24
+ microbuildUseESRP : true
24
25
enablePublishBuildArtifacts : false
25
26
enablePublishBuildAssets : false
26
27
enablePublishTestResults : false
@@ -135,10 +136,11 @@ jobs:
135
136
signType : $(_SignType)
136
137
zipSources : false
137
138
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
142
144
env :
143
145
TeamName : $(_TeamName)
144
146
MicroBuildOutputFolderOverride : ' $(Agent.TempDirectory)'
Original file line number Diff line number Diff line change 3
3
"dotnet" : " 8.0.117"
4
4
},
5
5
"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 "
8
8
}
9
9
}
Original file line number Diff line number Diff line change @@ -205,6 +205,10 @@ public void Dispose()
205
205
{
206
206
// Directory to cleanup may not be there if installation fails. Not an issue. Ignore the exception.
207
207
}
208
+ catch ( UnauthorizedAccessException e )
209
+ {
210
+ throw new Exception ( $ "Failed to remove { _sdkInstallationDirectory } ") ;
211
+ }
208
212
}
209
213
210
214
[ Theory ]
@@ -663,4 +667,4 @@ private static IEnumerable<string> GetQualityOptionsFromFlags(Quality flags)
663
667
}
664
668
}
665
669
}
666
- }
670
+ }
You can’t perform that action at this time.
0 commit comments