diff options
| -rw-r--r-- | build.cmd | 2 | ||||
| -rw-r--r-- | build.proj | 11 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | config.json | 8 | ||||
| -rw-r--r-- | src/.nuget/optdata/nuget.config | 6 | ||||
| -rw-r--r-- | src/.nuget/optdata/optdata.csproj | 8 |
6 files changed, 14 insertions, 23 deletions
@@ -320,7 +320,7 @@ REM ============================================================================ if %__RestoreOptData% EQU 1 if %__BuildTypeRelease% EQU 1 ( echo %__MsgPrefix%Restoring the OptimizationData Package - @call %__ProjectDir%\run.cmd sync -optdata + @call %__ProjectDir%\run.cmd sync -optdata %__UnprocessedBuildArgs% if not !errorlevel! == 0 ( echo %__MsgPrefix%Error: Failed to restore the optimization data package. exit /b 1 diff --git a/build.proj b/build.proj index eabe0e5b4b..bbec18785b 100644 --- a/build.proj +++ b/build.proj @@ -28,12 +28,11 @@ <Target Name="RestoreOptData"> <PropertyGroup> - <OptDataRestoreCommand>"$(DotnetToolCommand)"</OptDataRestoreCommand> - <OptDataRestoreCommand>$(OptDataRestoreCommand) restore</OptDataRestoreCommand> - <OptDataRestoreCommand>$(OptDataRestoreCommand) --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))"</OptDataRestoreCommand> + <_OptimizationDataFeed Condition="'$(DotNetBuildOffline)' != 'true'">--source https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json</_OptimizationDataFeed> </PropertyGroup> - <Exec Command="$(OptDataRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" - StandardOutputImportance="Low" /> + + <Exec Command="$(DotnetRestoreCommand) $(_OptimizationDataFeed) $(SourceDir).nuget/optdata/optdata.csproj" + StandardOutputImportance="Low" /> </Target> <!-- @@ -52,5 +51,5 @@ <Message Condition="Exists($(RootBinDir))" Importance="High" Text="Removing $(RootBinDir)"/> <RemoveDir Directories="$(RootBinDir)" /> </Target> - + </Project> @@ -164,7 +164,7 @@ restore_optdata() if [[ ( $__SkipRestoreOptData == 0 ) && ( $__isMSBuildOnNETCoreSupported == 1 ) ]]; then echo "Restoring the OptimizationData package" - "$__ProjectRoot/run.sh" sync -optdata + "$__ProjectRoot/run.sh" sync -optdata $__UnprocessedBuildArgs if [ $? != 0 ]; then echo "Failed to restore the optimization data package." exit 1 diff --git a/config.json b/config.json index 1725bc04a7..915c31807c 100644 --- a/config.json +++ b/config.json @@ -53,7 +53,7 @@ "valueType": "target", "values": [], "defaultValue": "" - }, + }, "ContainerName": { "description": "Container name for Azure upload.", "valueType": "property", @@ -589,6 +589,12 @@ "RestoreOptData": "default" } }, + "priority": { + "description": "Sets CLRTestPriorityToBuild property.", + "settings": { + "CLRTestPriorityToBuild": "default" + } + }, "ab": { "description": "Downloads the latests product packages from Azure. The values for '-AzureAccount' and '-AzureToken' are required", "settings": { diff --git a/src/.nuget/optdata/nuget.config b/src/.nuget/optdata/nuget.config deleted file mode 100644 index e747f7ecb9..0000000000 --- a/src/.nuget/optdata/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <packageSources> - <add key="myget.org dotnet-core-optimization-data" value="https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json" /> - </packageSources> -</configuration> diff --git a/src/.nuget/optdata/optdata.csproj b/src/.nuget/optdata/optdata.csproj index 76b5b97789..20e2a40ada 100644 --- a/src/.nuget/optdata/optdata.csproj +++ b/src/.nuget/optdata/optdata.csproj @@ -8,14 +8,6 @@ <RuntimeIdentifiers>win7-x64;win7-x86;linux-x64</RuntimeIdentifiers> </PropertyGroup> - <!-- Add optimization data package restore source. --> - <PropertyGroup> - <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'"> - https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json; - $(RestoreSources) - </RestoreSources> - </PropertyGroup> - <ItemGroup> <PackageReference Include="optimization.PGO.CoreCLR" Version="$(PgoDataPackageVersion)" Condition="'$(PgoDataPackageVersion)'!=''" /> <PackageReference Include="optimization.IBC.CoreCLR" Version="$(IbcDataPackageVersion)" Condition="'$(IbcDataPackageVersion)'!=''" /> |