Skip to content

Commit

Permalink
Refactor official build to use arcade templates (#6412)
Browse files Browse the repository at this point in the history
  • Loading branch information
ericstj authored Oct 27, 2022
1 parent e15ff5f commit de79b8a
Show file tree
Hide file tree
Showing 8 changed files with 296 additions and 376 deletions.
615 changes: 263 additions & 352 deletions build/vsts-ci.yml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
</PropertyGroup>
</Project>
25 changes: 7 additions & 18 deletions eng/Signing.props
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
<Project>
<ItemGroup Condition="'$(SignBinaries)' == 'true'">
<ItemsToSign Remove="@(ItemsToSign)" />
<ItemsToSign Include="$(ArtifactsDir)pkgassets\**\*.dll" />
<FileExtensionSignInfo Include="*.dll" CertificateName="MicrosoftDotNet500" />
</ItemGroup>
<ItemGroup Condition="'$(SignNugetPackages)' == 'true'">
<ItemsToSign Remove="@(ItemsToSign)" />
<ItemsToSign Include="$(ArtifactsDir)packages\**\*.nupkg" />
<ItemsToSign Include="$(ArtifactsDir)packages\**\*.snupkg" />
<FileExtensionSignInfo Include="*.nupkg" CertificateName="NuGet" />
<FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
</ItemGroup>
<ItemGroup>
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.snupkg" />
<FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
</ItemGroup>

<!-- Since this repo isn't on Arcade 6, the UseDotNetCertificate optionis not available. Do the update here instead. -->
<ItemGroup>
<FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
<StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
</ItemGroup>
<PropertyGroup>
<UseDotNetCertificate>true</UseDotNetCertificate>
</PropertyGroup>
</Project>
17 changes: 17 additions & 0 deletions eng/common-variables.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
variables:
- group: SDL_Settings
- name: BuildConfig
value: Release
- name: OfficialBuildId
value: $(BUILD.BUILDNUMBER)
- name: DOTNET_CLI_TELEMETRY_OPTOUT
value: 1
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
value: 1
- name: DOTNET_MULTILEVEL_LOOKUP
value: 0
- name: Codeql.Enabled
value: true
- name: Codeql.SkipTaskAutoInjection
value: True #default to not inject CodeQL tasks, we'll enable it in a single job.

2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3",
"Microsoft.Build.Traversal": "2.1.1",
"Microsoft.Build.Traversal": "3.2.0",
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
}
Expand Down
3 changes: 0 additions & 3 deletions sign.cmd

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(RepoRoot)eng/pkg/Pack.props" />
<PropertyGroup>
<Authors>Intel</Authors>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<IncludeBuildOutput Condition="'$(TargetFramework)' == 'netstandard2.0'">false</IncludeBuildOutput>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
Expand Down
4 changes: 3 additions & 1 deletion src/Native/Native.proj
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,10 @@
</Target>

<Target Name="Pack" />
<Target Name="Restore" />
<Target Name="Test" />

<ItemGroup>
<PackageDownload Include="MlNetMklDeps" Version="[$(MlNetMklDepsVersion)]" />
</ItemGroup>

</Project>

0 comments on commit de79b8a

Please sign in to comment.