Skip to content

Commit

Permalink
Update layout path for MS.Net.Compiler.Toolset
Browse files Browse the repository at this point in the history
Part of fixing the source build issue required that the compiler update
the layout of it's NuPkg. Need to respect that change here.
  • Loading branch information
Jared Parsons committed Apr 13, 2023
1 parent 8976e2c commit f597db6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/Layout/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
then need the version file there as well. -->
<Copy SourceFiles="$(OutputPath)/.version" DestinationFiles="$(BaseOutputPath)$(Configuration)/.version" SkipUnchangedFiles="true" />


</Target>

<Target Name="PublishRoslyn"
Expand All @@ -27,7 +27,7 @@
<RoslynDirectory>$(OutputPath)/Roslyn</RoslynDirectory>
</PropertyGroup>
<ItemGroup>
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/net6.0/**/*" />
<RoslynBits Include="$(NuGetPackageRoot)/microsoft.net.compilers.toolset/$(MicrosoftNetCompilersToolsetPackageVersion)/tasks/netcore/**/*" />
</ItemGroup>
<Error Condition="'@(RoslynBits)' == ''" Text="Something moved around in Roslyn package, adjust code here accordingly. TFM change?" />
<Copy SourceFiles="@(RoslynBits)" DestinationFiles="@(RoslynBits->'$(RoslynDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
Expand Down Expand Up @@ -56,7 +56,7 @@
<AnalyzerTargets Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/Microsoft.CodeAnalysis.NetAnalyzers.props" />
<AnalyzerTargets Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/Microsoft.CodeAnalysis.NetAnalyzers.targets" />
<AnalyzerConfig Include="$(PkgMicrosoft_CodeAnalysis_NetAnalyzers)/build/config/**/*" />

<ILLinkAnalyzersTargets Include="$(PkgMicrosoft_NET_ILLink_Analyzers)/build/Microsoft.NET.ILLink.Analyzers.props" />
<ILLinkAnalyzersAssemblies Include="$(PkgMicrosoft_NET_ILLink_Analyzers)/analyzers/dotnet/cs/**/*.dll" />

Expand Down Expand Up @@ -167,7 +167,7 @@
<Namespace Prefix="dn" Uri="http://schemas.microsoft.com/developer/msbuild/2003" />
</MSBuildNamespaces>
</PropertyGroup>

<XmlPoke
XmlInputPath="$(OutputPath)Sdks\Microsoft.NET.Sdk.Web\Sdk\Sdk.props"
Value="$(Version)"
Expand Down

0 comments on commit f597db6

Please sign in to comment.