Merge in 'release/6.0.4xx' changes

This commit is contained in:
dotnet-bot 2024-04-19 22:22:07 +00:00
commit 194d7f7c4c

View file

@ -2,7 +2,13 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup> <PropertyGroup>
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand> <LocalNuGetPackageCacheDirectory>$(BaseIntermediatePath)source-build-reference-package-cache</LocalNuGetPackageCacheDirectory>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:MicrosoftNetCoreIlasmPackageRuntimeId=$(NETCoreSdkRuntimeIdentifier)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) /p:LocalNuGetPackageCacheDirectory=$(LocalNuGetPackageCacheDirectory)</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile> <NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile> <GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
@ -16,5 +22,15 @@
<UseSourceBuiltSdkOverride Include="@(ArcadeBootstrapSdkOverride)" /> <UseSourceBuiltSdkOverride Include="@(ArcadeBootstrapSdkOverride)" />
</ItemGroup> </ItemGroup>
<Target Name="AddLocalNuGetPackageCacheDirectory" BeforeTargets="Build">
<MakeDir Condition="'$(LocalNuGetPackageCacheDirectory)' != ''"
Directories="$(LocalNuGetPackageCacheDirectory)" />
<AddSourceToNuGetConfig
NuGetConfigFile="$(NuGetConfigFile)"
SourceName="source-build-reference-package-cache"
SourcePath="$(LocalNuGetPackageCacheDirectory)" />
</Target>
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
</Project> </Project>