Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit aed8488

Browse files
AnipikAnipik
committed
Merge branch 'release/3.0' into release/3.0-preview9
2 parents 5700445 + 37fa8ea commit aed8488

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+537
-297
lines changed

‎eng/Publishing.props‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<Project>
2+
<!-- Used by Arcade to participate in publishing -->
3+
<Import Project="../dir.common.props" />
4+
5+
<PropertyGroup>
6+
<PublishDependsOnTargets>CollectCoreClrArtifacts;$(PublishDependsOnTargets)</PublishDependsOnTargets>
7+
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<!-- Redefine Arcade symbol store directory for CoreCLR -->
11+
<ArtifactsSymStoreDirectory>$([MSBuild]::NormalizeDirectory('$(BinDir)', 'PDB'))</ArtifactsSymStoreDirectory>
12+
13+
<!-- Used to define the OS moniker that will be used to create the asset manfiest. -->
14+
<AssetManifestOS>$(OSIdentifier)</AssetManifestOS>
15+
<!-- Used to define the PlatformName. -->
16+
<PlatformName>$(BuildArch)</PlatformName>
17+
</PropertyGroup>
18+
19+
<Target Name="CollectCoreClrArtifacts">
20+
<ItemGroup>
21+
<ExistingSymbolPackages Include="$(PackagesBinDir)symbolpkg\*.nupkg" IsShipping="true" />
22+
23+
<PackagesToPublish Include="$(PackagesBinDir)pkg\*.nupkg" IsShipping="true" />
24+
<PackagesToPublish Update="$(PackagesBinDir)pkg\transport*.nupkg" IsShipping="false" />
25+
</ItemGroup>
26+
27+
<!-- Managed-only packages are built on each windows leg, but we
28+
only want to upload them once. Let's arbitrarily upload these
29+
only from the x64 leg. -->
30+
<ItemGroup Condition=" '$(BuildArch)' != 'x64' ">
31+
<ExistingSymbolPackages Remove="$(PackagesBinDir)symbolpkg\Microsoft.NET.Sdk.IL*.nupkg" />
32+
<ExistingSymbolPackages Remove="$(PackagesBinDir)symbolpkg\Microsoft.TargetingPack.Private.CoreCLR*.nupkg" />
33+
34+
<PackagesToPublish Remove="$(PackagesBinDir)pkg\*Microsoft.NET.Sdk.IL*.nupkg" />
35+
<PackagesToPublish Remove="$(PackagesBinDir)pkg\*Microsoft.TargetingPack.Private.CoreCLR*.nupkg" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
<ItemsToPushToBlobFeed Include="@(PackagesToPublish);@(ExistingSymbolPackages)">
40+
<ManifestArtifactData Condition="!%(IsShipping)">NonShipping=true</ManifestArtifactData>
41+
</ItemsToPushToBlobFeed>
42+
</ItemGroup>
43+
</Target>
44+
</Project>

‎eng/SignCheckExclusionsFile.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
;; File passed to the SignCheck tool for exclusions
2+
3+
;; Skip verification on all NuGet packages
4+
*nupkg;;
5+
6+
;; The IL version of SPCL is never signed.
7+
runtimes/*/il/System.Private.CoreLib.dll;*nupkg;
8+
9+
;;
10+
;; Platforms that don't support signing.
11+
;;
12+
*;*osx*nupkg;
13+
*;*linux*nupkg;
14+
*;*rhel*nupkg;

‎eng/SymbolPublishingExclusionsFile.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tools/x86_arm/mscordaccore.dll
2+
tools/x86_arm/mscordbi.dll
3+
tools/x64_arm64/mscordaccore.dll
4+
tools/x64_arm64/mscordbi.dll

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19419.12">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19453.5">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>10b2260aeed5f07582bf8d8dcd4221a447b171c5</Sha>
7+
<Sha>6e94f0da0f12c7663ab39ce5bd6a67c4ab58b5ee</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19419.12">
9+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19453.5">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>10b2260aeed5f07582bf8d8dcd4221a447b171c5</Sha>
11+
<Sha>6e94f0da0f12c7663ab39ce5bd6a67c4ab58b5ee</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19419.12">
13+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19453.5">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>10b2260aeed5f07582bf8d8dcd4221a447b171c5</Sha>
15+
<Sha>6e94f0da0f12c7663ab39ce5bd6a67c4ab58b5ee</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19419.12">
17+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19453.5">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>10b2260aeed5f07582bf8d8dcd4221a447b171c5</Sha>
19+
<Sha>6e94f0da0f12c7663ab39ce5bd6a67c4ab58b5ee</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview9.19419.5">
21+
<Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc1.19454.13">
2222
<Uri>https://github.com/dotnet/corefx</Uri>
23-
<Sha>961b953eb77922d3906506ee15a58068abfa3284</Sha>
23+
<Sha>5f2c2771e077f98c097ecc1b9202bee22ef50aed</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19419.5">
25+
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc1.19454.13">
2626
<Uri>https://github.com/dotnet/corefx</Uri>
27-
<Sha>961b953eb77922d3906506ee15a58068abfa3284</Sha>
27+
<Sha>5f2c2771e077f98c097ecc1b9202bee22ef50aed</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19419-06">
29+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19455-02">
3030
<Uri>https://github.com/dotnet/core-setup</Uri>
31-
<Sha>5b508e86c9ce66af8b41bbc1f3b756e7724bcaa0</Sha>
31+
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
3232
</Dependency>
33-
<Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190807.1">
33+
<Dependency Name="optimization.IBC.CoreCLR" Version="99.99.99-master-20190902.1">
3434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
35-
<Sha>f721b85e367cd7dacaa74f5761cfd34d9e4fc423</Sha>
35+
<Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
3636
</Dependency>
37-
<Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20190807.1">
37+
<Dependency Name="optimization.PGO.CoreCLR" Version="99.99.99-master-20190902.1">
3838
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
39-
<Sha>f721b85e367cd7dacaa74f5761cfd34d9e4fc423</Sha>
39+
<Sha>48fd58c24cddbc6c0b0de1c00204aae1170f4864</Sha>
4040
</Dependency>
4141
</ToolsetDependencies>
4242
</Dependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
<MinorVersion>7</MinorVersion>
99
<!-- Always use shipping version instead of dummy versions -->
1010
<DotNetUseShippingVersions>true</DotNetUseShippingVersions>
11-
<PreReleaseVersionLabel>preview9</PreReleaseVersionLabel>
11+
<PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
1212
<!-- Opt-in/out repo features -->
1313
<UsingToolIbcOptimization>true</UsingToolIbcOptimization>
1414
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
1515
<UsingToolXliff>false</UsingToolXliff>
1616
<!-- Package versions -->
1717
<!-- arcade -->
18-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19419.12</MicrosoftDotNetBuildTasksFeedVersion>
19-
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19419.12</MicrosoftDotNetBuildTasksPackagingVersion>
18+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19453.5</MicrosoftDotNetBuildTasksFeedVersion>
19+
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19453.5</MicrosoftDotNetBuildTasksPackagingVersion>
2020
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2121
<!-- roslyn -->
2222
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
2323
<!-- corefx -->
24-
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview9.19419.5</MicrosoftPrivateCoreFxNETCoreAppVersion>
25-
<MicrosoftNETCorePlatformsVersion>3.0.0-preview9.19419.5</MicrosoftNETCorePlatformsVersion>
24+
<MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-rc1.19454.13</MicrosoftPrivateCoreFxNETCoreAppVersion>
25+
<MicrosoftNETCorePlatformsVersion>3.0.0-rc1.19454.13</MicrosoftNETCorePlatformsVersion>
2626
<MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
2727
<!-- core-setup -->
28-
<MicrosoftNETCoreAppVersion>3.0.0-preview9-19419-06</MicrosoftNETCoreAppVersion>
28+
<MicrosoftNETCoreAppVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppVersion>
2929
<!-- dotnet-core-internal-tooling -->
3030
<IbcMergePackageVersion>5.0.6-beta.19203.1</IbcMergePackageVersion>
3131
<!-- dotnet-optimization -->
32-
<optimizationIBCCoreCLRVersion>99.99.99-master-20190807.1</optimizationIBCCoreCLRVersion>
33-
<optimizationPGOCoreCLRVersion>99.99.99-master-20190807.1</optimizationPGOCoreCLRVersion>
32+
<optimizationIBCCoreCLRVersion>99.99.99-master-20190902.1</optimizationIBCCoreCLRVersion>
33+
<optimizationPGOCoreCLRVersion>99.99.99-master-20190902.1</optimizationPGOCoreCLRVersion>
3434
</PropertyGroup>
3535
<!--Package names-->
3636
<PropertyGroup>

‎eng/build-job.yml‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
# Compute job name from template parameters
2222
name: ${{ format('build_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
23-
displayName: ${{ format('Build {0} {1} {2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
23+
displayName: ${{ format('{0} {1} {2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
2424

2525
# FreeBSD builds are disabled in the public project because we
2626
# don't have any FreeBSD agents in the public pool.
@@ -131,23 +131,24 @@ jobs:
131131

132132
# Sign on Windows
133133
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest'), eq(parameters.osGroup, 'Windows_NT')) }}:
134-
- script: powershell eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(buildConfigUpper) /p:DotNetSignType=%_SignType% -projects $(Build.SourcesDirectory)\eng\empty.csproj
134+
- powershell: eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 /p:ArcadeBuild=true /p:OfficialBuild=true /p:BuildOS=$(osGroup) /p:BuildArch=$(archType) /p:BuildType=$(_BuildConfig) /p:DotNetSignType=$env:_SignType -projects $(Build.SourcesDirectory)\eng\empty.csproj
135135
displayName: Sign Binaries
136136

137137
- task: PublishBuildArtifacts@1
138-
displayName: Publish Signing Logs to VSTS
138+
displayName: Publish Signing Logs
139139
inputs:
140140
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/'
141141
PublishLocation: Container
142-
ArtifactName: $(Agent.Os)_$(Agent.JobName)_$(archType)
142+
ArtifactName: ${{ format('SignLogs_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
143143
continueOnError: true
144144
condition: always()
145145

146+
# Publish product output directory for consumption by tests.
146147
- task: PublishBuildArtifacts@1
147148
displayName: Publish product build
148149
inputs:
149-
pathtoPublish: $(Build.SourcesDirectory)/bin/Product/$(osGroup).$(archType).$(buildConfigUpper)
150-
artifactName: ${{ format('{0}_{1}_{2}_build', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
150+
pathtoPublish: $(Build.SourcesDirectory)/bin/Product/$(osGroup).$(archType).$(_BuildConfig)
151+
artifactName: ${{ format('BinDir_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
151152

152153
# Get key vault secrets for publishing
153154
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
@@ -159,22 +160,16 @@ jobs:
159160

160161
# Build packages
161162
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
162-
- script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(crossPackagesArg) $(officialBuildIdArg) $(portableBuildArg) -ci
163+
- script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(crossPackagesArg) $(officialBuildIdArg) $(portableBuildArg) -ci
163164
displayName: Build packages
164165
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
165-
- script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(officialBuildIdArg) -ci
166+
- script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(_BuildConfig) $(officialBuildIdArg) -ci
166167
displayName: Build packages
167168

168169
# Publish official build
169170
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
170171
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
171-
- script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.csproj
172-
displayName: Restore blob feed tasks
173-
${{ if eq(parameters.osGroup, 'FreeBSD') }}:
174-
env:
175-
# Arcade uses this SDK instead of trying to restore one.
176-
DotNetCoreSdkDir: /usr/local/dotnet
177-
- script: ./eng/common/msbuild.sh --ci src/publishwitharcade.proj /p:__BuildType=$(buildConfigUpper) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osIdentifier) /p:AzureFeedUrl=$(dotnetfeedUrl) /p:AzureAccountKey=$(dotnetfeedPAT)
172+
- script: ./eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osIdentifier) /bl:"$(Build.SourcesDirectory)/bin/Logs/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj
178173
displayName: Publish packages to blob feed
179174
env:
180175
# TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
@@ -184,25 +179,17 @@ jobs:
184179
DotNetCoreSdkDir: /usr/local/dotnet
185180
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
186181
# TODO: pass publish feed url and access token in from the internal pipeline
187-
- powershell: eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.csproj
188-
displayName: Restore blob feed tasks
189-
- powershell: eng\common\msbuild.ps1 -ci src\publishwitharcade.proj /p:__BuildType=$(buildConfigUpper) /p:__BuildArch=$(archType) /p:OSIdentifier=$(osIdentifier) /p:AzureFeedUrl=$(dotnetfeedUrl) /p:AzureAccountKey=$(dotnetfeedPAT)
182+
- powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:__BuildType=$(_BuildConfig) /p:__BuildArch=$(archType) /p:__BuildOS=$(osGroup) /p:OSIdentifier=$(osIdentifier) /bl:"$(Build.SourcesDirectory)\bin\Logs\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj
190183
displayName: Publish packages to blob feed
191184
env:
192185
# TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
193186
NUGET_PACKAGES: $(Build.SourcesDirectory)\.packages
194-
# Save nuget packages in pipeline for update dotnet/versions
195-
- task: PublishPipelineArtifact@0
196-
displayName: Save packages as pipeline artifact
197-
inputs:
198-
artifactName: ${{ format('build_{0}_{1}_{2}_nuget', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
199-
targetPath: $(Build.SourcesDirectory)/bin/Product/$(osGroup).$(archType).$(buildConfigUpper)/.nuget/pkg
200187

201188
# Publish Logs
202189
- task: PublishBuildArtifacts@1
203190
displayName: Publish Logs
204191
inputs:
205192
pathtoPublish: $(Build.SourcesDirectory)/bin/Logs
206-
artifactName: ${{ format('build_{0}_{1}_{2}_Logs', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
193+
artifactName: ${{ format('BuildLogs_{0}_{1}_{2}', parameters.osIdentifier, parameters.archType, parameters.buildConfig) }}
207194
continueOnError: true
208195
condition: always()

‎eng/common/darc-init.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4+
$verbosity = "m"
45
)
56

6-
$verbosity = "m"
77
. $PSScriptRoot\tools.ps1
88

99
function InstallDarcCli ($darcVersion) {

‎eng/common/darc-init.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
1823
*)
1924
echo "Invalid argument: $1"
2025
usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
3439
[[ $source != /* ]] && source="$scriptroot/$source"
3540
done
3641
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3842

3943
. "$scriptroot/tools.sh"
4044

‎eng/common/native/CommonLibrary.psm1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ function Get-File {
152152
}
153153
else {
154154
Write-Verbose "Downloading $Uri"
155+
# Don't display the console progress UI - it's a huge perf hit
156+
$ProgressPreference = 'SilentlyContinue'
155157
while($Attempt -Lt $DownloadRetries)
156158
{
157159
try {

0 commit comments

Comments
 (0)