Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/7.0.1xx] Migrate to 1ES templates for internal builds #39841

Merged
merged 14 commits into from
Apr 2, 2024
Merged

[release/7.0.1xx] Migrate to 1ES templates for internal builds #39841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5c52072
Update to 1ES pipelines
dsplaisted Mar 15, 2024
6bbc13a
Use 1ES publish
dsplaisted Mar 15, 2024
43e1996
Stop using strategy matrices
dsplaisted Mar 15, 2024
ed5770d
Change variable insertion
dsplaisted Mar 15, 2024
53842d7
Fix group syntax
dsplaisted Mar 18, 2024
3d35b0a
Fix incorrect OS name
dsplaisted Mar 19, 2024
dfbd6a5
Add template engine pipelines
dsplaisted Mar 19, 2024
0b8ea08
Fix template-engine public yaml
dsplaisted Mar 21, 2024
e261f29
Use MicroBuildOutputFolderOverride to move the MicroBuild plugin inst…
dsplaisted Mar 26, 2024
88da9a0
Fix publishing and don't run formatting tests in official builds
mmitche Mar 26, 2024
6d42a7e
skip CanSortByDownloadCountAndThenByName because it's blocking
baronfel Mar 26, 2024
e048bc9
Update dependencies from https://github.com/dotnet/arcade build
dotnet-maestro[bot] Mar 21, 2024
fb9cd51
Update dependencies from https://github.com/dotnet/arcade build
dotnet-maestro[bot] Mar 22, 2024
77b7edc
Remove the extra key publishAssetsImmediately
v-wuzhai Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
416 changes: 264 additions & 152 deletions .vsts-ci.yml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ stages:
- publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
artifact: BuildConfiguration
displayName: Publish Build Config
- template: /eng/build.yml
- template: /eng/build-pr.yml
parameters:
agentOs: Windows_NT
pool:
Expand Down Expand Up @@ -96,7 +96,7 @@ stages:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343'
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/build.yml
- template: /eng/build-pr.yml
parameters:
agentOs: Windows_NT_FullFramework
pool:
Expand All @@ -117,7 +117,7 @@ stages:
_SignType: test
_Test: -test

- template: /eng/build.yml
- template: /eng/build-pr.yml
parameters:
agentOs: Windows_NT_TestAsTools
pool:
Expand All @@ -133,7 +133,7 @@ stages:
_PublishArgs: ''
_SignType: test

- template: /eng/build.yml
- template: /eng/build-pr.yml
parameters:
agentOs: Ubuntu_20_04
pool:
Expand All @@ -154,7 +154,7 @@ stages:
_SignType: test
_Test: -test

- template: /eng/build.yml
- template: /eng/build-pr.yml
parameters:
agentOs: Darwin
pool:
Expand Down
8 changes: 0 additions & 8 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<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" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<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" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<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" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<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" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -38,16 +34,12 @@
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-2dcf0af" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-d0ca5a8-1" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-dff486f" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-8e24710" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,22 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24114.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.24171.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24114.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.24171.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24114.4">
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.24171.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24114.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.24171.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c9bbc4b7606b46f6121a2758d2555dfc6322ed88</Sha>
<Sha>834d09f0c963da37c88aed7ba3a83acafe582948</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24114.4</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>7.0.0-beta.24171.6</MicrosoftDotNetSignToolVersion>
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>7.0.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
Expand Down Expand Up @@ -187,7 +187,7 @@
<PropertyGroup>
<FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24114.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.24171.6</MicrosoftDotNetXUnitExtensionsVersion>
<MoqPackageVersion>4.8.2</MoqPackageVersion>
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
</PropertyGroup>
Expand Down