Skip to content

Commit ba574bc

Browse files
v-wuzhaidsplaistedmmitchebaronfeldotnet-maestro[bot]
authored
[release/7.0.1xx] Migrate to 1ES templates for internal builds (#39841)
Co-authored-by: Daniel Plaisted <[email protected]> Co-authored-by: Matt Mitchell (.NET) <[email protected]> Co-authored-by: Chet Husk <[email protected]> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 28319c3 commit ba574bc

37 files changed

+2540
-249
lines changed

.vsts-ci.yml

Lines changed: 264 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:
@@ -117,7 +117,7 @@ stages:
117117
_SignType: test
118118
_Test: -test
119119

120-
- template: /eng/build.yml
120+
- template: /eng/build-pr.yml
121121
parameters:
122122
agentOs: Windows_NT_TestAsTools
123123
pool:
@@ -133,7 +133,7 @@ stages:
133133
_PublishArgs: ''
134134
_SignType: test
135135

136-
- template: /eng/build.yml
136+
- template: /eng/build-pr.yml
137137
parameters:
138138
agentOs: Ubuntu_20_04
139139
pool:
@@ -154,7 +154,7 @@ stages:
154154
_SignType: test
155155
_Test: -test
156156

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

NuGet.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-d0ca5a8d-1/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-aspnetcore -->
98
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
109
<add key="darc-pub-DotNet-msbuild-Trusted-6918b86" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-6918b863/nuget/v3/index.json" />
1110
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1211
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1312
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1413
<!-- Begin: Package sources from dotnet-runtime -->
15-
<add key="darc-int-dotnet-runtime-dff486f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dff486f2/nuget/v3/index.json" />
1614
<!-- End: Package sources from dotnet-runtime -->
1715
<!-- Begin: Package sources from dotnet-templating -->
18-
<add key="darc-int-dotnet-templating-2dcf0af" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2dcf0af2/nuget/v3/index.json" />
1916
<!-- End: Package sources from dotnet-templating -->
2017
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21-
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8e247102/nuget/v3/index.json" />
2218
<!-- End: Package sources from dotnet-windowsdesktop -->
2319
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2420
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -38,16 +34,12 @@
3834
<disabledPackageSources>
3935
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4036
<!-- Begin: Package sources from dotnet-templating -->
41-
<add key="darc-int-dotnet-templating-2dcf0af" value="true" />
4237
<!-- End: Package sources from dotnet-templating -->
4338
<!-- Begin: Package sources from dotnet-aspnetcore -->
44-
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="true" />
4539
<!-- End: Package sources from dotnet-aspnetcore -->
4640
<!-- Begin: Package sources from dotnet-runtime -->
47-
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
4841
<!-- End: Package sources from dotnet-runtime -->
4942
<!-- Begin: Package sources from dotnet-windowsdesktop -->
50-
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="true" />
5143
<!-- End: Package sources from dotnet-windowsdesktop -->
5244
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5345
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,22 +283,22 @@
283283
</Dependency>
284284
</ProductDependencies>
285285
<ToolsetDependencies>
286-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
286+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
287287
<Uri>https://github.com/dotnet/arcade</Uri>
288-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
288+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
289289
<SourceBuild RepoName="arcade" ManagedOnly="true" />
290290
</Dependency>
291-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.4">
291+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
292292
<Uri>https://github.com/dotnet/arcade</Uri>
293-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
293+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24114.4">
295+
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24171.6">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
297+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.4">
299+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24171.6">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
301+
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
302302
</Dependency>
303303
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
304304
<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.24114.4</MicrosoftDotNetSignToolVersion>
37+
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24171.6</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
3939
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -187,7 +187,7 @@
187187
<PropertyGroup>
188188
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
189189
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
190-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.4</MicrosoftDotNetXUnitExtensionsVersion>
190+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24171.6</MicrosoftDotNetXUnitExtensionsVersion>
191191
<MoqPackageVersion>4.8.2</MoqPackageVersion>
192192
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
193193
</PropertyGroup>

0 commit comments

Comments
 (0)