Skip to content

Commit de79b8a

Browse files
authored
Refactor official build to use arcade templates (#6412)
1 parent e15ff5f commit de79b8a

File tree

8 files changed

+296
-376
lines changed

8 files changed

+296
-376
lines changed

build/vsts-ci.yml

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

eng/Publishing.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<PublishingVersion>3</PublishingVersion>
4+
</PropertyGroup>
5+
</Project>

eng/Signing.props

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
<Project>
2-
<ItemGroup Condition="'$(SignBinaries)' == 'true'">
3-
<ItemsToSign Remove="@(ItemsToSign)" />
4-
<ItemsToSign Include="$(ArtifactsDir)pkgassets\**\*.dll" />
5-
<FileExtensionSignInfo Include="*.dll" CertificateName="MicrosoftDotNet500" />
6-
</ItemGroup>
7-
<ItemGroup Condition="'$(SignNugetPackages)' == 'true'">
8-
<ItemsToSign Remove="@(ItemsToSign)" />
9-
<ItemsToSign Include="$(ArtifactsDir)packages\**\*.nupkg" />
10-
<ItemsToSign Include="$(ArtifactsDir)packages\**\*.snupkg" />
11-
<FileExtensionSignInfo Include="*.nupkg" CertificateName="NuGet" />
12-
<FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
13-
</ItemGroup>
2+
<ItemGroup>
3+
<ItemsToSign Include="$(ArtifactsPackagesDir)**\*.snupkg" />
4+
<FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
5+
</ItemGroup>
146

15-
<!-- Since this repo isn't on Arcade 6, the UseDotNetCertificate optionis not available. Do the update here instead. -->
16-
<ItemGroup>
17-
<FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
18-
<StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
19-
<FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
20-
</ItemGroup>
7+
<PropertyGroup>
8+
<UseDotNetCertificate>true</UseDotNetCertificate>
9+
</PropertyGroup>
2110
</Project>

eng/common-variables.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
variables:
2+
- group: SDL_Settings
3+
- name: BuildConfig
4+
value: Release
5+
- name: OfficialBuildId
6+
value: $(BUILD.BUILDNUMBER)
7+
- name: DOTNET_CLI_TELEMETRY_OPTOUT
8+
value: 1
9+
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
10+
value: 1
11+
- name: DOTNET_MULTILEVEL_LOOKUP
12+
value: 0
13+
- name: Codeql.Enabled
14+
value: true
15+
- name: Codeql.SkipTaskAutoInjection
16+
value: True #default to not inject CodeQL tasks, we'll enable it in a single job.
17+

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"msbuild-sdks": {
1414
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22514.3",
1515
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22514.3",
16-
"Microsoft.Build.Traversal": "2.1.1",
16+
"Microsoft.Build.Traversal": "3.2.0",
1717
"Microsoft.SourceLink.GitHub": "1.1.0-beta-20206-02",
1818
"Microsoft.SourceLink.Common": "1.1.0-beta-20206-02"
1919
}

sign.cmd

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$(RepoRoot)eng/pkg/Pack.props" />
33
<PropertyGroup>
4-
<Authors>Intel</Authors>
54
<TargetFrameworks>netstandard2.0</TargetFrameworks>
65
<IncludeBuildOutput Condition="'$(TargetFramework)' == 'netstandard2.0'">false</IncludeBuildOutput>
76
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>

src/Native/Native.proj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@
143143
</Target>
144144

145145
<Target Name="Pack" />
146-
<Target Name="Restore" />
147146
<Target Name="Test" />
148147

148+
<ItemGroup>
149+
<PackageDownload Include="MlNetMklDeps" Version="[$(MlNetMklDepsVersion)]" />
150+
</ItemGroup>
149151

150152
</Project>

0 commit comments

Comments
 (0)