Skip to content

Commit 68f35c5

Browse files
mstfblmstfbl
committed
Added fixes for official builds
1 parent f4ffdf8 commit 68f35c5

File tree

33 files changed

+106
-101
lines changed

33 files changed

+106
-101
lines changed

‎build/publish.proj

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<Project>
2+
3+
<ItemGroup>
4+
<PackageReference Include="Microsoft.DotNet.BuildTools" Version="$(BuildToolsPackageVersion)" />
5+
</ItemGroup>
6+
27
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
38

4-
<UsingTask TaskName="ExecWithRetriesForNuGetPush" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll" />
9+
<UsingTask TaskName="ExecWithRetriesForNuGetPush" AssemblyFile="$(NuGetPackageRoot)\microsoft.dotnet.buildtools\$(BuildToolsPackageVersion)\lib\Microsoft.DotNet.Build.Tasks.dll" />
510

611
<PropertyGroup>
712
<PublishSymbolsPackage>Microsoft.SymbolUploader.Build.Task</PublishSymbolsPackage>
813
<EnablePublishSymbols Condition="'$(EnablePublishSymbols)'==''" >true</EnablePublishSymbols>
914
<NuGetPushTimeoutSeconds Condition="'$(NuGetPushTimeoutSeconds)' == ''">600</NuGetPushTimeoutSeconds>
1015
</PropertyGroup>
1116

12-
<Import Project="$(PackagesDir)\$(PublishSymbolsPackage.ToLower())\$(PublishSymbolsPackageVersion)\build\PublishSymbols.targets" />
17+
<Import Project="$(NuGetPackageRoot)\$(PublishSymbolsPackage.ToLower())\$(MicrosoftSymbolUploaderBuildTaskVersion)\build\PublishSymbols.targets" />
1318

1419
<Target Name="PublishPackages">
1520
<Error Condition="'$(NuGetFeedUrl)' == ''" Text="Missing required property NuGetFeedUrl" />
1621
<Error Condition="'$(NuGetApiKey)' == ''" Text="Missing required property NuGetApiKey" />
1722

1823
<ItemGroup>
19-
<NuGetPackages Include="$(PackageOutputPath)**\*.nupkg"
20-
Exclude="$(PackageOutputPath)**\*.symbols.*nupkg" />
24+
<NuGetPackages Include="$(ArtifactsDir)packages\**\*.nupkg"
25+
Exclude="$(ArtifactsDir)packages\**\*.snupkg" />
2126

2227
<!--
2328
IgnorableErrorMessages applies to the "ExectWithRetriesForNuGetPush" task.
@@ -34,7 +39,7 @@
3439
<Message Text="Pushing ML.NET packages to $(NuGetFeedUrl)" />
3540

3641
<PropertyGroup>
37-
<DotnetToolCommand>$(ToolsDir)dotnetcli/dotnet</DotnetToolCommand>
42+
<DotnetToolCommand>$(MSBuildThisFileDirectory)..\.dotnet\dotnet</DotnetToolCommand>
3843
<NuGetPushCommand>$(DotnetToolCommand) nuget push --source $(NuGetFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds)</NuGetPushCommand>
3944
</PropertyGroup>
4045

@@ -46,7 +51,7 @@
4651
Condition="'$(EnablePublishSymbols)'=='true'"
4752
DependsOnTargets="SetupPublishSymbols">
4853
<Message Text="Attempting to Publish Symbols" />
49-
<Error Condition="!Exists('$(PackageOutputPath)')" Text="'PackageOutputPath' folder '$(PackageOutputPath)' does not exist."/>
54+
<Error Condition="!Exists('$(ArtifactsDir)packages')" Text="'PackageOutputPath' folder '$(PackageOutputPath)' does not exist."/>
5055
<Error Condition="'$(SymbolServerPath)'==''" Text="Missing property SymbolServerPath" />
5156
<Error Condition="'$(SymbolServerPAT)'==''" Text="Missing property SymbolServerPAT" />
5257
<CallTarget Targets="PublishSymbols" />
@@ -59,11 +64,11 @@
5964
</PropertyGroup>
6065

6166
<ItemGroup>
62-
<SymbolPackagesToPublish Include="$(PackageOutputPath)**\*.symbols.*nupkg" />
67+
<SymbolPackagesToPublish Include="$(ArtifactsDir)packages\**\*.snupkg" />
6368
</ItemGroup>
6469

6570
<Message Importance="High" Text="Publishing @(SymbolPackagesToPublish) to $(SymbolServerPath)"/>
6671
<Error Condition="'@(SymbolPackagesToPublish)'==''" Text="There are no symbol nuget packages to publish" />
6772
</Target>
6873

69-
</Project>
74+
</Project>

‎build/sign.proj

-50
This file was deleted.

‎build/vsts-ci.yml

+36-39
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@ phases:
2323
- agent.os -equals linux
2424
container: CentosContainer
2525
steps:
26+
- script: ./restore.sh
27+
displayName: restore all projects
28+
- script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
29+
displayName: build redist
2630
# Only build native assets to avoid conflicts.
27-
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
31+
- script: ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64
2832
displayName: Build
2933

3034
- task: PublishBuildArtifacts@1
3135
displayName: Publish Linux package assets
3236
inputs:
33-
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
37+
pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
3438
artifactName: PackageAssets
3539
artifactType: container
3640

@@ -46,23 +50,26 @@ phases:
4650
queue:
4751
name: Hosted macOS
4852
steps:
49-
# Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/1811
5053
- script: |
5154
brew uninstall [email protected] |
5255
brew uninstall [email protected] |
5356
brew untap local/openssl |
5457
brew untap local/python2
5558
displayName: MacOS Homebrew bug Workaround
56-
- script: brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
59+
- script: brew update && brew unlink [email protected] && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
5760
displayName: Install build dependencies
61+
- script: ./restore.sh
62+
displayName: restore all projects
63+
- script: ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
64+
displayName: build redist
5865
# Only build native assets to avoid conflicts.
59-
- script: ./build.sh -buildNative -$(BuildConfig) -skipRIDAgnosticAssets
66+
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64
6067
displayName: Build
6168

6269
- task: PublishBuildArtifacts@1
6370
displayName: Publish macOS package assets
6471
inputs:
65-
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
72+
pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
6673
artifactName: PackageAssets
6774
artifactType: container
6875

@@ -95,27 +102,26 @@ phases:
95102
continueOnError: false
96103
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
97104

105+
- script: ./restore.cmd
106+
displayName: restore all projects
107+
- script: ./build.cmd -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
108+
displayName: build redist
98109
# Only build native assets to avoid conflicts.
99-
- script: ./build.cmd -buildNative -$(BuildConfig) -buildArch=x86 -skipRIDAgnosticAssets
110+
- script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86
100111
displayName: Build
101112

102-
- task: MSBuild@1
103-
displayName: Sign Windows_x86 Binaries
104-
inputs:
105-
solution: build/sign.proj
106-
msbuildArguments: /p:SignType=$(_SignType)
107-
msbuildVersion: 15.0
108-
continueOnError: false
113+
- script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:SignBinaries=true
114+
displayName: sign binaries
109115

110116
- task: PublishBuildArtifacts@1
111117
displayName: Publish Windows_x86 package assets
112118
inputs:
113-
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
119+
pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
114120
artifactName: PackageAssets
115121
artifactType: container
116122

117123
# Terminate all dotnet build processes.
118-
- script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown
124+
- script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown
119125
displayName: Dotnet Server Shutdown
120126

121127
################################################################################
@@ -148,7 +154,7 @@ phases:
148154
condition: and(succeeded(), in(variables._SignType, 'real', 'test'))
149155

150156
# Build both native and managed assets.
151-
- script: ./build.cmd -$(BuildConfig)
157+
- script: ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64
152158
displayName: Build
153159

154160
- task: ComponentGovernanceComponentDetection@0
@@ -158,23 +164,18 @@ phases:
158164
alertWarningLevel: 'High'
159165

160166

161-
- task: MSBuild@1
162-
displayName: Sign Windows_x64 Binaries
163-
inputs:
164-
solution: build/sign.proj
165-
msbuildArguments: /p:SignType=$(_SignType)
166-
msbuildVersion: 15.0
167-
continueOnError: false
167+
- script: ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:SignBinaries=true
168+
displayName: sign binaries
168169

169170
- task: PublishBuildArtifacts@1
170171
displayName: Publish Windows_x64 package assets
171172
inputs:
172-
pathToPublish: $(Build.SourcesDirectory)/bin/obj/packages
173+
pathToPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
173174
artifactName: PackageAssets
174175
artifactType: container
175176

176177
# Terminate all dotnet build processes.
177-
- script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown
178+
- script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown
178179
displayName: Dotnet Server Shutdown
179180

180181
################################################################################
@@ -220,31 +221,27 @@ phases:
220221
displayName: Download package assets
221222
inputs:
222223
artifactName: PackageAssets
223-
downloadPath: $(Build.SourcesDirectory)/bin/obj/packages
224+
downloadPath: $(Build.SourcesDirectory)/artifacts/pkgassets
224225

225226
# Workaround https://github.com/Microsoft/vsts-tasks/issues/6739
226227
- task: CopyFiles@2
227228
displayName: Copy package assets to correct folder
228229
inputs:
229-
sourceFolder: $(Build.SourcesDirectory)/bin/obj/packages/PackageAssets
230-
targetFolder: $(Build.SourcesDirectory)/bin/obj/packages
230+
sourceFolder: $(Build.SourcesDirectory)/artifacts/pkgassets/PackageAssets
231+
targetFolder: $(Build.SourcesDirectory)/artifacts/pkgassets
231232

232-
- script: ./build.cmd -buildPackages
233-
displayName: Create Packages
233+
- script: ./build.cmd -pack -configuration $(BuildConfig)
234+
displayName: Build Packages
234235

235-
- task: MSBuild@1
236-
displayName: Sign Packages
237-
inputs:
238-
solution: build/sign.proj
239-
msbuildArguments: /p:SignType=$(_SignType) /p:SignNugetPackages=true
240-
msbuildVersion: 15.0
236+
- script: ./sign.cmd /p:SignNugetPackages=true
237+
displayName: sign packages
241238
continueOnError: false
242239

243240
- task: NuGetAuthenticate@0
244241
inputs:
245242
nuGetServiceConnections: machinelearning-dnceng-public-feed # To allow publishing to a feed of another organization
246243

247-
- script: Tools\dotnetcli\dotnet msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts
244+
- script: $(Build.SourcesDirectory)\.dotnet\dotnet.exe msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts
248245
displayName: Publish Packages to AzureDevOps Feed
249246

250247
- task: MSBuild@1
@@ -264,5 +261,5 @@ phases:
264261
continueOnError: true
265262

266263
# Terminate all dotnet build processes.
267-
- script: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet.exe build-server shutdown
264+
- script: $(Build.SourcesDirectory)/.dotnet/dotnet.exe build-server shutdown
268265
displayName: Dotnet Server Shutdown

‎eng/Signing.props

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<Project>
2-
<ItemGroup>
3-
<!-- <StrongNameSignInfo Include="$(RepoRoot)\Tools\Open.snk" PublicKeyToken="cc7b13ffcd2ddd51" CertificateName="Microsoft400" />
4-
<StrongNameSignInfo Include="$(RepoRoot)\Tools\Test.snk" PublicKeyToken="9d77cc7ad39b68eb" CertificateName="Microsoft400" /> -->
5-
</ItemGroup
2+
<ItemGroup Condition="'$(SignBinaries)' == 'true'">
3+
<ItemsToSign Remove="@(ItemsToSign)" />
4+
<ItemsToSign Include="$(ArtifactsDir)pkgassets\**\*.dll" />
5+
<FileExtensionSignInfo Include="*.dll" CertificateName="Microsoft400" />
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>
614
</Project>

‎eng/Versions.props

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
4545
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
4646
<MicrosoftSourceLinkVersion>1.1.0-beta-20206-02</MicrosoftSourceLinkVersion>
47+
<BuildToolsPackageVersion>3.0.0-preview4-04926-01</BuildToolsPackageVersion>
4748

4849
<!-- Test-only Dependencies -->
4950
<BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>

‎restore.cmd

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -warnAsError 0 %*"
3+
exit /b %ErrorLevel%

‎restore.sh

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
SOURCE="${BASH_SOURCE[0]}"
6+
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
7+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
8+
SOURCE="$(readlink "$SOURCE")"
9+
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
10+
done
11+
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
12+
13+
"$DIR/eng/common/build.sh" --restore --warnAsError false "$@"

‎sign.cmd

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@echo off
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -sign -warnAsError 0 %*"
3+
exit /b %ErrorLevel%

‎src/Microsoft.Extensions.ML/Microsoft.Extensions.ML.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IncludeInPackage>Microsoft.Extensions.ML</IncludeInPackage>
67
<PackageDescription>An integration package for ML.NET models on scalable web apps and services.</PackageDescription>
78
</PropertyGroup>
89

‎src/Microsoft.ML.AutoML/Microsoft.ML.AutoML.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IncludeInPackage>Microsoft.ML.AutoML</IncludeInPackage>
67
<PackageDescription>ML.NET AutoML: Optimizes an ML pipeline for your dataset, by automatically locating the best feature engineering, model, and hyperparameters</PackageDescription>
78
</PropertyGroup>
89

‎src/Microsoft.ML.CodeGenerator/Microsoft.ML.CodeGenerator.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IncludeInPackage>Microsoft.ML.CodeGenerator</IncludeInPackage>
67
<PackageDescription>ML.NET Code Generator</PackageDescription>
78
</PropertyGroup>
89

‎src/Microsoft.ML.CpuMath/Microsoft.ML.CpuMath.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
6+
<IncludeInPackage>Microsoft.ML.CpuMath</IncludeInPackage>
67
<PackageDescription>Microsoft.ML.CpuMath contains optimized math routines for ML.NET.</PackageDescription>
78
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
89
<DefineConstants>$(DefineConstants);CPUMATH_INFRASTRUCTURE</DefineConstants>

‎src/Microsoft.ML.DataView/Microsoft.ML.DataView.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IncludeInPackage>Microsoft.ML.DataView</IncludeInPackage>
67
<PackageDescription>Contains the IDataView system which is a set of interfaces and components that provide efficient, compositional processing of schematized data for machine learning and advanced analytics applications.</PackageDescription>
78
</PropertyGroup>
89

‎src/Microsoft.ML.DnnImageFeaturizer.AlexNet/Microsoft.ML.DnnImageFeaturizer.AlexNet.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<PropertyGroup>
55
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IncludeInPackage>Microsoft.ML.DnnImageFeaturizer.AlexNet</IncludeInPackage>
67
<PackageDescription>ML.NET component for pretrained AlexNet image featurization</PackageDescription>
78
</PropertyGroup>
89

0 commit comments

Comments
 (0)