зеркало из https://github.com/dotnet/msbuild.git
Merge pull request #10643 from dotnet/net9-rc1
This commit is contained in:
Коммит
3b9f2e9569
|
@ -37,4 +37,30 @@
|
|||
<RemoveDir Directories="$(_PackageFolderInGlobalPackages)"
|
||||
Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
|
||||
</Target>
|
||||
|
||||
<!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12 or a future 17.11 patch -->
|
||||
<Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))">
|
||||
<PrimeSystemTextJson804 />
|
||||
</Target>
|
||||
<UsingTask
|
||||
TaskName="PrimeSystemTextJson804"
|
||||
TaskFactory="RoslynCodeTaskFactory"
|
||||
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
|
||||
<Task>
|
||||
<Code Type="Fragment" Language="cs">
|
||||
<![CDATA[
|
||||
try
|
||||
{
|
||||
System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll");
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Best effort: if something moves in the SDK don't break the build.
|
||||
}
|
||||
]]>
|
||||
</Code>
|
||||
</Task>
|
||||
</UsingTask>
|
||||
<!-- END workaround for https://github.com/dotnet/sdk/issues/43339 -->
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="!$(TargetFramework.StartsWith('net4'))">
|
||||
<BootstrapSdkVersion>9.0.100-preview.7.24407.12</BootstrapSdkVersion>
|
||||
<BootstrapSdkVersion>9.0.100-rc.1.24452.12</BootstrapSdkVersion>
|
||||
</PropertyGroup>
|
||||
<Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
|
||||
<!-- See https://github.com/dotnet/arcade/issues/3386
|
||||
|
|
|
@ -86,7 +86,7 @@ try {
|
|||
{
|
||||
$buildToolPath = Join-Path $bootstrapRoot "core\dotnet.exe"
|
||||
# The version must be consistent with BootstrapSdkVersion
|
||||
$buildToolCommand = Join-Path $bootstrapRoot "core\sdk\9.0.100-preview.7.24407.12\MSBuild.dll"
|
||||
$buildToolCommand = Join-Path $bootstrapRoot "core\sdk\9.0.100-rc.1.24452.12\MSBuild.dll"
|
||||
$buildToolFramework = "net9.0"
|
||||
}
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ if [ $host_type = "core" ]
|
|||
then
|
||||
_InitializeBuildTool="$bootstrapRoot/core/dotnet"
|
||||
# The version must be consistent with BootstrapSdkVersion
|
||||
_InitializeBuildToolCommand="$bootstrapRoot/core/sdk/9.0.100-preview.7.24407.12/MSBuild.dll"
|
||||
_InitializeBuildToolCommand="$bootstrapRoot/core/sdk/9.0.100-rc.1.24452.12/MSBuild.dll"
|
||||
_InitializeBuildToolFramework="net9.0"
|
||||
else
|
||||
echo "Unsupported hostType ($host_type)"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
"allowPrerelease": true
|
||||
},
|
||||
"tools": {
|
||||
"dotnet": "9.0.100-preview.7.24407.12",
|
||||
"dotnet": "9.0.100-rc.1.24452.12",
|
||||
"vs": {
|
||||
"version": "17.10.0"
|
||||
},
|
||||
|
|
Загрузка…
Ссылка в новой задаче