Skip to content

Commit cce6cc0

Browse files
authored
[release/7.0.4xx] Migrate to 1ES templates for internal builds (#39845)
2 parents 0d89950 + 24c61a5 commit cce6cc0

31 files changed

+2516
-213
lines changed

.vsts-ci.yml

Lines changed: 263 additions & 152 deletions
Large diffs are not rendered by default.

.vsts-pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ stages:
6565
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
6666
artifact: BuildConfiguration
6767
displayName: Publish Build Config
68-
- template: /eng/build.yml
68+
- template: /eng/build-pr.yml
6969
parameters:
7070
agentOs: Windows_NT
7171
pool:
@@ -96,7 +96,7 @@ stages:
9696
name: 'Managed'
9797
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
9898
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
99-
- template: /eng/build.yml
99+
- template: /eng/build-pr.yml
100100
parameters:
101101
agentOs: Windows_NT_FullFramework
102102
pool:
@@ -118,7 +118,7 @@ stages:
118118
_SignType: test
119119
_Test: -test
120120

121-
- template: /eng/build.yml
121+
- template: /eng/build-pr.yml
122122
parameters:
123123
agentOs: Windows_NT_TestAsTools
124124
pool:
@@ -134,7 +134,7 @@ stages:
134134
_PublishArgs: ''
135135
_SignType: test
136136

137-
- template: /eng/build.yml
137+
- template: /eng/build-pr.yml
138138
parameters:
139139
agentOs: Ubuntu_20_04
140140
pool:
@@ -155,7 +155,7 @@ stages:
155155
_SignType: test
156156
_Test: -test
157157

158-
- template: /eng/build.yml
158+
- template: /eng/build-pr.yml
159159
parameters:
160160
agentOs: Darwin
161161
pool:

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,22 @@
287287
</Dependency>
288288
</ProductDependencies>
289289
<ToolsetDependencies>
290-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24163.12">
290+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24176.7">
291291
<Uri>https://github.com/dotnet/arcade</Uri>
292-
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
292+
<Sha>ea5ae5b4a608862561d02a158dfaac443fbaaff1</Sha>
293293
<SourceBuild RepoName="arcade" ManagedOnly="true" />
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24163.12">
295+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24176.7">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
297+
<Sha>ea5ae5b4a608862561d02a158dfaac443fbaaff1</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24163.12">
299+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24176.7">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
301+
<Sha>ea5ae5b4a608862561d02a158dfaac443fbaaff1</Sha>
302302
</Dependency>
303-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24163.12">
303+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24176.7">
304304
<Uri>https://github.com/dotnet/arcade</Uri>
305-
<Sha>bbc75d8a5897763eaf6945c263759930e02dd32b</Sha>
305+
<Sha>ea5ae5b4a608862561d02a158dfaac443fbaaff1</Sha>
306306
</Dependency>
307307
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
308308
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
3535
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3636
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
37-
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24163.12</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24176.7</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -190,7 +190,7 @@
190190
<PropertyGroup>
191191
<FluentAssertionsVersion>6.11.0</FluentAssertionsVersion>
192192
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
193-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24163.12</MicrosoftDotNetXUnitExtensionsVersion>
193+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24176.7</MicrosoftDotNetXUnitExtensionsVersion>
194194
<MoqPackageVersion>4.18.4</MoqPackageVersion>
195195
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
196196
</PropertyGroup>

0 commit comments

Comments
 (0)