summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BuildToolsVersion.txt2
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json2
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Linux.json2
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Mac.json2
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json2
-rw-r--r--buildpipeline/DotNet-CoreClr-Trusted-Windows.json2
-rw-r--r--buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json58
-rw-r--r--config.json18
-rw-r--r--dependencies.props12
-rw-r--r--dir.props12
-rw-r--r--src/createVersionFile.proj13
-rw-r--r--src/syncAzure.proj1
-rw-r--r--sync.cmd2
-rw-r--r--tests/build.proj2
-rw-r--r--tests/dir.props15
-rw-r--r--tests/publishdependency.targets2
-rw-r--r--tests/runtest.proj12
-rw-r--r--tests/src/dir.props1
18 files changed, 140 insertions, 20 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index a72a2229ed..c6b2318d21 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-01702-02
+2.0.0-prerelease-01702-02 \ No newline at end of file
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
index 6432a889c7..312d08c928 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux-Crossbuild.json
@@ -157,7 +157,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
index 82c282d022..882c1127ec 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Linux.json
@@ -139,7 +139,7 @@
},
"inputs": {
"filename": "docker",
- "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
+ "arguments": "run --rm $(DockerCommonRunArgs) ./build-packages.sh -BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
index ae289d15f0..b96ebb5bbf 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Mac.json
@@ -67,7 +67,7 @@
},
"inputs": {
"filename": "$(Agent.BuildDirectory)/s/build-packages.sh",
- "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture)",
+ "arguments": "-BuildType=$(PB_BuildType) -BuildArch=$(Architecture) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
index f6a852f7cd..8ec9054c63 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows-x86.json
@@ -131,7 +131,7 @@
},
"inputs": {
"filename": "build-packages.cmd",
- "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
+ "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
index cb2e57080e..6cf49de9a6 100644
--- a/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
+++ b/buildpipeline/DotNet-CoreClr-Trusted-Windows.json
@@ -131,7 +131,7 @@
},
"inputs": {
"filename": "build-packages.cmd",
- "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType)",
+ "arguments": "-BuildArch=$(Architecture) -BuildType=$(PB_BuildType) -- /p:OfficialBuildId=$(OfficialBuildId)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
index b501f9a8a7..8e46631db0 100644
--- a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -41,7 +41,7 @@
"enabled": true,
"continueOnError": true,
"alwaysRun": false,
- "displayName": "Run sync.cmd",
+ "displayName": "Sync test native binaries",
"timeoutInMinutes": 0,
"task": {
"id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
@@ -59,6 +59,60 @@
"enabled": true,
"continueOnError": false,
"alwaysRun": false,
+ "displayName": "Sync packages",
+ "timeoutInMinutes": 0,
+ "task": {
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+ "versionSpec": "1.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "filename": "sync.cmd",
+ "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -BlobNamePrefix=$(PB_BuildType)/pkg/Microsoft",
+ "workingFolder": "",
+ "failOnStandardError": "false"
+ }
+ },
+ {
+ "enabled": true,
+ "continueOnError": false,
+ "alwaysRun": false,
+ "displayName": "Sync runtime packages",
+ "timeoutInMinutes": 0,
+ "task": {
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+ "versionSpec": "1.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "filename": "sync.cmd",
+ "arguments": "-ab -AzureAccount=$(CloudDropAccountName) -AzureToken=$(CloudDropAccessToken) -Container=$(Label) -BlobNamePrefix=$(PB_BuildType)/pkg/runtime",
+ "workingFolder": "",
+ "failOnStandardError": "false"
+ }
+ },
+ {
+ "enabled": true,
+ "continueOnError": false,
+ "alwaysRun": false,
+ "displayName": "Generate version props file",
+ "timeoutInMinutes": 0,
+ "task": {
+ "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+ "versionSpec": "1.*",
+ "definitionType": "task"
+ },
+ "inputs": {
+ "filename": "msbuild",
+ "arguments": "createVersionFile.proj /p:OfficialBuildId=$(OfficialBuildId)",
+ "workingFolder": "src",
+ "failOnStandardError": "false"
+ }
+ },
+ {
+ "enabled": true,
+ "continueOnError": false,
+ "alwaysRun": false,
"displayName": "Run build-test.cmd",
"timeoutInMinutes": 0,
"task": {
@@ -68,7 +122,7 @@
},
"inputs": {
"filename": "build-test.cmd",
- "arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg)$(CrossgenArg)-OfficialBuildId=$(OfficialBuildId) -Priority=$(Priority)",
+ "arguments": "$(PB_BuildType) $(Architecture) buildagainstpackages runtimeid $(Rid) $(TargetsNonWindowsArg)$(CrossgenArg)-OfficialBuildId=$(OfficialBuildId) -OverwriteCoreClrPackageVersion -Priority=$(Priority)",
"workingFolder": "",
"failOnStandardError": "false"
}
diff --git a/config.json b/config.json
index a5f98aa9a4..a85dcd5ecd 100644
--- a/config.json
+++ b/config.json
@@ -30,6 +30,12 @@
"values": [],
"defaultValue": ""
},
+ "__BlobNamePrefix": {
+ "description": "Blob Prefix for Azure download.",
+ "valueType": "property",
+ "values": [],
+ "defaultValue": ""
+ },
"MsBuildFileLogging": {
"description": "MsBuild logging options.",
"valueType": "passThrough",
@@ -174,6 +180,12 @@
"values": [],
"defaultValue": ""
},
+ "OverwriteCoreClrPackageVersion": {
+ "description": "Sets the property specifying to overwrite CoreClr Package version using OfficialBuildId",
+ "valueType": "property",
+ "values": [ true, false ],
+ "defaultValue": true
+ },
"OfficialBuildId": {
"description": "Official Build Id.",
"valueType": "property",
@@ -531,6 +543,12 @@
"__Container": "default"
}
},
+ "blobNamePrefix": {
+ "description": "Blob Prefix to download from in Azure container.",
+ "settings": {
+ "__BlobNamePrefix": "default"
+ }
+ },
"runtimeId": {
"description": "Runtime ID of the binaries in the specified container.",
"settings": {
diff --git a/dependencies.props b/dependencies.props
index 77f5c7930e..530ac23d00 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -1,4 +1,16 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- Central place to set the versions of all nuget packages produced in the repo -->
+ <PackageVersion Condition="'$(PackageVersion)' == ''">2.1.0</PackageVersion>
+
+ <!-- Set the boolean below to true to generate packages with stabilized versions -->
+ <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+ <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
+
+ <PreReleaseLabel>preview1</PreReleaseLabel>
+ </PropertyGroup>
+
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
<CoreFxCurrentRef>6fa6ed1a40843f4ec7c0779aed68ec01b888ba1a</CoreFxCurrentRef>
diff --git a/dir.props b/dir.props
index 451e550673..9039f49cb0 100644
--- a/dir.props
+++ b/dir.props
@@ -124,7 +124,6 @@
<!-- Packaging properties -->
<PropertyGroup>
<LicenseUrl>https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT</LicenseUrl>
- <PreReleaseLabel>preview1</PreReleaseLabel>
<PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile>
<PackageLicenseFile>$(ProjectDir)LICENSE.TXT</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(ProjectDir)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
@@ -138,13 +137,6 @@
<ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
<ProjectUrl>https://dot.net</ProjectUrl>
-
- <!-- Central place to set the versions of all nuget packages produced in the repo -->
- <PackageVersion Condition="'$(PackageVersion)' == ''">2.1.0</PackageVersion>
-
- <!-- Set the boolean below to true to generate packages with stabilized versions -->
- <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
- <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires
pulling in different packaging dependencies.
@@ -186,6 +178,10 @@
<PackageIndex Include="$(PackageIndexFile)" />
</ItemGroup>
+ <PropertyGroup>
+ <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
+ </PropertyGroup>
+
<!-- Use Roslyn Compilers to build -->
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" />
<Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" />
diff --git a/src/createVersionFile.proj b/src/createVersionFile.proj
new file mode 100644
index 0000000000..4edddc7118
--- /dev/null
+++ b/src/createVersionFile.proj
@@ -0,0 +1,13 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <Import Project="..\dir.props" />
+ <Import Project="$(ToolsDir)versioning.targets" Condition="Exists('$(ToolsDir)versioning.targets')"/>
+
+ <PropertyGroup>
+ <VersionPropsImported>false</VersionPropsImported>
+ </PropertyGroup>
+
+ <Target Name="Build"
+ DependsOnTargets="CreateOrUpdateCurrentVersionFile">
+ </Target>
+</Project> \ No newline at end of file
diff --git a/src/syncAzure.proj b/src/syncAzure.proj
index a5bb4958a9..aeea48de9a 100644
--- a/src/syncAzure.proj
+++ b/src/syncAzure.proj
@@ -7,6 +7,7 @@
<ContainerName Condition="'$(__Container)' == '' and '$(ContainerNamePrefix)' != '' and '$(BuildNumberMajor)' != '' and '$(BuildNumberMinor)' != ''">$(ContainerNamePrefix)-$(BuildNumberMajor)-$(BuildNumberMinor)</ContainerName>
<ContainerName Condition="'$(__Container)' != ''">$(__Container)</ContainerName>
<ContainerName>$(ContainerName.Replace(".","-"))</ContainerName>
+ <BlobNamePrefix>$(__BlobNamePrefix)</BlobNamePrefix>
<DownloadDirectory Condition="'$(PublishTestNativeBins)' != 'true'">$(PackagesDir)AzureTransfer</DownloadDirectory>
<DownloadDirectory Condition="'$(PublishTestNativeBins)' == 'true'">$(PackagesDir)TestNativeBins\$(RuntimeId)</DownloadDirectory>
</PropertyGroup>
diff --git a/sync.cmd b/sync.cmd
index f63315559d..218fb9de8e 100644
--- a/sync.cmd
+++ b/sync.cmd
@@ -26,6 +26,8 @@ echo -BuildMajor
echo -BuildMinor
echo To download from a specific container, specify:
echo -Container="container name"
+echo To download blobs starting with a specific prefix, specify:
+echo -BlobNamePrefix="Blob name prefix"
echo -n - Downloads test native binaries from the specified container
echo The following properties are required:
echo -AzureAccount="Account name"
diff --git a/tests/build.proj b/tests/build.proj
index 584ac58acf..a57c8835d9 100644
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -51,7 +51,7 @@
</Target>
<Target Name="RestorePackage">
- <Exec Command="$(DotnetRestoreCommand) $(RestoreProj)"
+ <Exec Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)"
StandardOutputImportance="Low" />
</Target>
diff --git a/tests/dir.props b/tests/dir.props
index f44d73a19d..0b548db02b 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -1,5 +1,4 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
<!--
$(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
-->
@@ -85,6 +84,7 @@
<ItemGroup>
<!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. -->
+ <DotnetSourceList Include="$(PackagesDir)AzureTransfer\$(__BuildType)\pkg\" Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" />
<DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" />
<DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
@@ -95,6 +95,19 @@
<RestorePackages>false</RestorePackages>
</PropertyGroup>
+ <PropertyGroup>
+ <BuildVersionFile>$(BaseIntermediateOutputPath)BuildVersion-$(OfficialBuildId).props</BuildVersionFile>
+ </PropertyGroup>
+
+ <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in bin/obj -->
+ <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />
+
+ <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
+ <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
+ <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)</VersionToRestore>
+ <PackageVersionArg>/p:CoreClrPackageVersion=$(VersionToRestore)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</PackageVersionArg>
+ </PropertyGroup>
+
<!-- Which tests shall we build? Default: Priority 0 tests.
At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and
all tests with CLRTestPriority 666,..., 1 AND 0 will build.
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 80d1f71a52..8cae729776 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
- <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(CoreClrPackageVersion)\tools\crossgen*"/>
+ <CrossGenFiles Include="..\packages\runtime.$(TargetRid).Microsoft.NETCore.Runtime.CoreCLR\$(DesiredPackageVersionArg)\tools\crossgen*"/>
</ItemGroup>
<PropertyGroup>
diff --git a/tests/runtest.proj b/tests/runtest.proj
index 18b3304fa9..15734cedf4 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -323,7 +323,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
<ItemGroup>
<AllRunnableTestPaths Include="$(XunitTestBinBase)\**\*.cmd" />
</ItemGroup>
- </Target>
+ </Target>
+
+ <!-- If we want to overwrite the desired CoreCLR package version, we need to get the new version from the generated props file in bin/obj -->
+ <Import Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'" Project="$(BuildVersionFile)" />
+
+ <PropertyGroup Condition="'$(OverwriteCoreClrPackageVersion)' == 'true'">
+ <VersionToRestore Condition="'$(StableVersion)' != ''">$(StableVersion)</VersionToRestore>
+ <VersionToRestore Condition="'$(VersionToRestore)' == ''">$(PackageVersion)</VersionToRestore>
+ <DesiredPackageVersionArg>$(VersionToRestore)-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)</DesiredPackageVersionArg>
+ </PropertyGroup>
<Import Project="tests.targets" />
<Import Project="publishdependency.targets" />
@@ -331,6 +340,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
<PropertyGroup>
<TargetRid Condition="'$(RuntimeId)' != ''">$(RuntimeId)</TargetRid>
<TargetRid Condition="'$(RuntimeId)' == ''">$(TestNugetRuntimeId)</TargetRid>
+ <DesiredPackageVersionArg Condition="'$(DesiredPackageVersionArg)' == ''">$(CoreClrPackageVersion)</DesiredPackageVersionArg>
</PropertyGroup>
<Target Name="CreateTestOverlay">
diff --git a/tests/src/dir.props b/tests/src/dir.props
index 7f1f523cc4..8fb03f2acd 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -94,4 +94,5 @@
<NuGetTargetMonikerShort>netcoreapp2.0</NuGetTargetMonikerShort>
<PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
</PropertyGroup>
+
</Project>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-16 21:13:24 +0000