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

Commit 3cb371f

Browse files
wtgodbewtgodbe
authored
Merge pull request #12116 from wtgodbe/PackageVersion200
Test current packages in CoreCLR official builds
2 parents fdd4e91 + 959daa7 commit 3cb371f

18 files changed

+140
-20
lines changed

‎BuildToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-prerelease-01528-03
1+
2.0.0-prerelease-01702-02

‎buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
},
158158
"inputs": {
159159
"filename": "docker",
160-
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
160+
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
161161
"workingFolder": "",
162162
"failOnStandardError": "false"
163163
}

‎buildpipeline/DotNet-CoreClr-Trusted-Linux.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
},
140140
"inputs": {
141141
"filename": "docker",
142-
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
142+
"arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
143143
"workingFolder": "",
144144
"failOnStandardError": "false"
145145
}

‎buildpipeline/DotNet-CoreClr-Trusted-Mac.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
"inputs": {
6969
"filename": "$(Agent.BuildDirectory)/s/build-packages.sh",
70-
"arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
70+
"arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
7171
"workingFolder": "",
7272
"failOnStandardError": "false"
7373
}

‎buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
},
132132
"inputs": {
133133
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
134+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
135135
"workingFolder": "",
136136
"failOnStandardError": "false"
137137
}

‎buildpipeline/DotNet-CoreClr-Trusted-Windows.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
},
132132
"inputs": {
133133
"filename": "build-packages.cmd",
134-
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
134+
"arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
135135
"workingFolder": "",
136136
"failOnStandardError": "false"
137137
}

‎buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json‎

Lines changed: 56 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"enabled": true,
4242
"continueOnError": true,
4343
"alwaysRun": false,
44-
"displayName": "Run sync.cmd",
44+
"displayName": "Sync test native binaries",
4545
"timeoutInMinutes": 0,
4646
"task": {
4747
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -55,6 +55,60 @@
5555
"failOnStandardError": "false"
5656
}
5757
},
58+
{
59+
"enabled": true,
60+
"continueOnError": false,
61+
"alwaysRun": false,
62+
"displayName": "Sync packages",
63+
"timeoutInMinutes": 0,
64+
"task": {
65+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
66+
"versionSpec": "1.*",
67+
"definitionType": "task"
68+
},
69+
"inputs": {
70+
"filename": "sync.cmd",
71+
"arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -BlobNamePrefix=$(PB_BuildType)/pkg/Microsoft",
72+
"workingFolder": "",
73+
"failOnStandardError": "false"
74+
}
75+
},
76+
{
77+
"enabled": true,
78+
"continueOnError": false,
79+
"alwaysRun": false,
80+
"displayName": "Sync runtime packages",
81+
"timeoutInMinutes": 0,
82+
"task": {
83+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
84+
"versionSpec": "1.*",
85+
"definitionType": "task"
86+
},
87+
"inputs": {
88+
"filename": "sync.cmd",
89+
"arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -BlobNamePrefix=$(PB_BuildType)/pkg/runtime",
90+
"workingFolder": "",
91+
"failOnStandardError": "false"
92+
}
93+
},
94+
{
95+
"enabled": true,
96+
"continueOnError": false,
97+
"alwaysRun": false,
98+
"displayName": "Generate version props file",
99+
"timeoutInMinutes": 0,
100+
"task": {
101+
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
102+
"versionSpec": "1.*",
103+
"definitionType": "task"
104+
},
105+
"inputs": {
106+
"filename": "msbuild",
107+
"arguments": "createVersionFile.proj /p:OfficialBuildId=$(OfficialBuildId)",
108+
"workingFolder": "src",
109+
"failOnStandardError": "false"
110+
}
111+
},
58112
{
59113
"enabled": true,
60114
"continueOnError": false,
@@ -68,7 +122,7 @@
68122
},
69123
"inputs": {
70124
"filename": "build-test.cmd",
71-
"arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg)$(CrossgenArg)-OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority)",
125+
"arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg)$(CrossgenArg)-OfficialBuildId=$(OfficialBuildId) -OverwriteCoreClrPackageVersion -Priority=$(Priority)",
72126
"workingFolder": "",
73127
"failOnStandardError": "false"
74128
}

‎config.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
"values": [],
3131
"defaultValue": ""
3232
},
33+
"__BlobNamePrefix": {
34+
"description": "Blob Prefix for Azure download.",
35+
"valueType": "property",
36+
"values": [],
37+
"defaultValue": ""
38+
},
3339
"MsBuildFileLogging": {
3440
"description": "MsBuild logging options.",
3541
"valueType": "passThrough",
@@ -174,6 +180,12 @@
174180
"values": [],
175181
"defaultValue": ""
176182
},
183+
"OverwriteCoreClrPackageVersion": {
184+
"description": "Sets the property specifying to overwrite CoreClr Package version using OfficialBuildId",
185+
"valueType": "property",
186+
"values": [ true, false ],
187+
"defaultValue": true
188+
},
177189
"OfficialBuildId": {
178190
"description": "Official Build Id.",
179191
"valueType": "property",
@@ -531,6 +543,12 @@
531543
"__Container": "default"
532544
}
533545
},
546+
"blobNamePrefix": {
547+
"description": "Blob Prefix to download from in Azure container.",
548+
"settings": {
549+
"__BlobNamePrefix": "default"
550+
}
551+
},
534552
"runtimeId": {
535553
"description": "Runtime ID of the binaries in the specified container.",
536554
"settings": {

‎dependencies.props‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
3+
<PropertyGroup>
4+
<!-- Central place to set the versions of all nuget packages produced in the repo -->
5+
<PackageVersion Condition="'$(PackageVersion)' == ''">2.0.0</PackageVersion>
6+
7+
<!-- Set the boolean below to true to generate packages with stabilized versions -->
8+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
9+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
10+
11+
<PreReleaseLabel>preview2</PreReleaseLabel>
12+
</PropertyGroup>
13+
214
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
315
<PropertyGroup>
416
<CoreFxCurrentRef>d4040dc6f74933eec9827d44e288c9cd15996a15</CoreFxCurrentRef>

‎dir.props‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<!-- Packaging properties -->
121121
<PropertyGroup>
122122
<LicenseUrl>https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT</LicenseUrl>
123-
<PreReleaseLabel>preview2</PreReleaseLabel>
124123
<PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile>
125124
<PackageLicenseFile>$(ProjectDir)LICENSE.TXT</PackageLicenseFile>
126125
<PackageThirdPartyNoticesFile>$(ProjectDir)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
@@ -134,13 +133,6 @@
134133
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
135134

136135
<ProjectUrl>https://dot.net</ProjectUrl>
137-
138-
<!-- Central place to set the versions of all nuget packages produced in the repo -->
139-
<PackageVersion Condition="'$(PackageVersion)' == ''">2.0.0</PackageVersion>
140-
141-
<!-- Set the boolean below to true to generate packages with stabilized versions -->
142-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
143-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
144136

145137
<!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires
146138
pulling in different packaging dependencies.
@@ -182,6 +174,10 @@
182174
<PackageIndex Include="$(PackageIndexFile)" />
183175
</ItemGroup>
184176

177+
<PropertyGroup>
178+
<BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
179+
</PropertyGroup>
180+
185181
<!-- Use Roslyn Compilers to build -->
186182
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" />
187183
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" />

0 commit comments

Comments
 (0)