Skip to content

Commit ddc90b8

Browse files
authored
Temporary introduce rc1 workaround to arcade tools restore until there's a fix
1 parent 91d5a0a commit ddc90b8

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

eng/common/internal/Tools.csproj

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,31 @@
66
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
77
<BuildWithNetFrameworkHostedCompiler>false</BuildWithNetFrameworkHostedCompiler>
88
</PropertyGroup>
9+
<!-- BEGIN workaround for https://github.com/dotnet/sdk/issues/43339; remove after updated to VS 17.12, future 17.11 patch or when arcade ships the the same workaround -->
10+
<Target Name="WorkaroundDotnetSdk43339" BeforeTargets="ResolvePackageAssets" Condition=" '$(MSBuildRuntimeType)' == 'Full' and $([MSBuild]::VersionLessThan($(MSBuildVersion), 17.12.0))">
11+
<PrimeSystemTextJson804 />
12+
</Target>
13+
<UsingTask
14+
TaskName="PrimeSystemTextJson804"
15+
TaskFactory="RoslynCodeTaskFactory"
16+
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
17+
<Task>
18+
<Code Type="Fragment" Language="cs">
19+
<![CDATA[
20+
try
21+
{
22+
System.Reflection.Assembly.LoadFrom(@"$(MicrosoftNETBuildTasksDirectoryRoot)\..\..\..\DotnetTools\dotnet-format\BuildHost-net472\System.Text.Json.dll");
23+
}
24+
catch
25+
{
26+
// Best effort: if something moves in the SDK don't break the build.
27+
}
28+
]]>
29+
</Code>
30+
</Task>
31+
</UsingTask>
32+
<!-- END workaround for https://github.com/dotnet/sdk/issues/43339 -->
33+
934
<ItemGroup>
1035
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
1136
<PackageReference Remove="@(PackageReference)"/>

0 commit comments

Comments
 (0)