diff options
| -rw-r--r-- | build.cmd | 6 | ||||
| -rw-r--r-- | build.proj | 2 | ||||
| -rwxr-xr-x | build.sh | 4 | ||||
| -rw-r--r-- | eng/build-job.yml | 1 | ||||
| -rw-r--r-- | src/.nuget/optdata/Directory.Build.props | 9 | ||||
| -rw-r--r-- | src/.nuget/optdata/ibcmerge.csproj | 1 |
6 files changed, 16 insertions, 7 deletions
@@ -394,10 +394,10 @@ if %__RestoreOptData% EQU 1 ( REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake set OptDataProjectFilePath=%__ProjectDir%\src\.nuget\optdata\optdata.csproj -for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /p:ArcadeBuild^=true /nologo') do ( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do ( set __PgoOptDataVersion=%%s ) -for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /p:ArcadeBuild^=true /nologo') do ( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do ( set __IbcOptDataVersion=%%s ) @@ -646,7 +646,7 @@ if %__BuildCoreLib% EQU 1 ( if %__IbcOptimize% EQU 1 ( echo %__MsgPrefix%Commencing IBCMerge of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% set IbcMergeProjectFilePath=%__ProjectDir%\src\.nuget\optdata\ibcmerge.csproj - for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /p:ArcadeBuild^=true /nologo') do @( + for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @( set __IbcMergeVersion=%%s ) diff --git a/build.proj b/build.proj index f723179b18..3ccf06db2e 100644 --- a/build.proj +++ b/build.proj @@ -7,7 +7,7 @@ <Import Project="dir.traversal.targets" /> <Target Name="RestoreOptData" Condition="'$(RestoreDuringBuild)'=='true' and '$(BuildType)'=='Release'"> - <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj /p:ArcadeBuild=true" StandardOutputImportance="Low" /> + <Exec Command="$(DotnetRestoreCommand) $(SourceDir).nuget/optdata/optdata.csproj" StandardOutputImportance="Low" /> </Target> <Import Project="$(ToolsDir)clean.targets" /> @@ -160,13 +160,13 @@ restore_optdata() fi fi local OptDataProjectFilePath="$__ProjectRoot/src/.nuget/optdata/optdata.csproj" - __PgoOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /p:ArcadeBuild=true /nologo) + __PgoOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo) if [ $? != 0 ]; then echo "Failed to get PGO data package version." exit $? fi __PgoOptDataVersion=$(echo $__PgoOptDataVersion | sed 's/^\s*//') - __IbcOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /p:ArcadeBuild=true /nologo) + __IbcOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /nologo) if [ $? != 0 ]; then echo "Failed to get IBC data package version." exit $? diff --git a/eng/build-job.yml b/eng/build-job.yml index 3c3fa19725..9395240056 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -114,7 +114,6 @@ jobs: displayName: Restore internal tools inputs: command: restore - arguments: /p:ArcadeBuild=true feedsToUse: config projects: 'src/.nuget/optdata/ibcmerge.csproj' nugetConfigPath: 'eng/internal/NuGet.config' diff --git a/src/.nuget/optdata/Directory.Build.props b/src/.nuget/optdata/Directory.Build.props new file mode 100644 index 0000000000..496325d8be --- /dev/null +++ b/src/.nuget/optdata/Directory.Build.props @@ -0,0 +1,9 @@ +<Project> + <!-- Projects for optdata should all use Arcade --> + <PropertyGroup> + <ArcadeBuild>true</ArcadeBuild> + </PropertyGroup> + + <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> + +</Project>
\ No newline at end of file diff --git a/src/.nuget/optdata/ibcmerge.csproj b/src/.nuget/optdata/ibcmerge.csproj index b995471fdd..9dae43fd14 100644 --- a/src/.nuget/optdata/ibcmerge.csproj +++ b/src/.nuget/optdata/ibcmerge.csproj @@ -15,6 +15,7 @@ <PropertyGroup> <RestoreSources> + $(RestoreSources); https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; </RestoreSources> </PropertyGroup> |