Skip to content

Commit 7b6654d

Browse files
author
John Luo
authored
Remove workarounds no longer needed after migrating to preview 7 SDK (#12812)
1 parent d52d7e3 commit 7b6654d

File tree

2 files changed

+5
-26
lines changed

2 files changed

+5
-26
lines changed

eng/Workarounds.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,9 @@
4343
This one sets UseSharedCompilation to false by default. -->
4444
<UseSharedCompilation>true</UseSharedCompilation>
4545
</PropertyGroup>
46+
47+
<PropertyGroup>
48+
<!-- Ignore warning about calling the Pack target on Web SDK projects. Our build scripts call /t:pack on everything in this repo. -->
49+
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
50+
</PropertyGroup>
4651
</Project>

eng/Workarounds.targets

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
1616
</PropertyGroup>
1717

18-
<!-- Workaround https://github.com/dotnet/sdk/issues/2976 -->
19-
<ItemGroup>
20-
<PackageReference Update="Microsoft.NETCore.Platforms" PrivateAssets="All" />
21-
</ItemGroup>
22-
2318
<!-- Workaround https://github.com/aspnet/AspNetCore/issues/7503. This chains GenerateSourceLinkFile before razor component targets run. -->
2419
<!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so do not apply this worksaround. -->
2520
<Target Condition="'$(DotNetBuildFromSource)' != 'true'"
@@ -30,12 +25,6 @@
3025
<!-- Workaround https://github.com/dotnet/source-build/issues/1112. Source link is currently disabled in source build so define this dummy target which is required for pack. -->
3126
<Import Condition="'$(DotNetBuildFromSource)' == 'true'" Project="WorkaroundsImported.targets" />
3227

33-
<!-- Workaround https://github.com/aspnet/websdk/pull/646. If merged, once we update to a websdk with this fix, we can move the setting below to Directory.Build.props. -->
34-
<PropertyGroup>
35-
<!-- Ignore warning about calling the Pack target on Web SDK projects. Our build scripts call /t:pack on everything in this repo. -->
36-
<WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
37-
</PropertyGroup>
38-
3928
<!-- Workaround for https://github.com/dotnet/arcade/issues/204 -->
4029
<ItemGroup>
4130
<PackageReference Include="Internal.AspNetCore.BuildTasks" PrivateAssets="All" Version="$(InternalAspNetCoreBuildTasksPackageVersion)" IsImplicitlyDefined="true" />
@@ -54,21 +43,6 @@
5443
</KnownFrameworkReference>
5544
</ItemGroup>
5645

57-
<!-- Workaround until we can build our repo with a 3.0 Preview 7 SDK which has https://github.com/dotnet/core-sdk/pull/2401. -->
58-
<ItemGroup Condition="'$(PreReleasePreviewNumber)' == '7' ">
59-
<KnownFrameworkReference Update="Microsoft.NETCore.App">
60-
<!--
61-
Temporary until we can update to build with the Preview7 SDK .
62-
Using PreReleasePreviewNumber to time-bomb this so we can remove this before RTM.
63-
64-
This workaround was also applied to src\ProjectTemplates\test\Infrastructure\TemplateTests.props.in.
65-
-->
66-
<RuntimePackNamePatterns>Microsoft.NETCore.App.Runtime.**RID**</RuntimePackNamePatterns>
67-
<AppHostPackNamePattern />
68-
<AppHostRuntimeIdentifiers />
69-
</KnownFrameworkReference>
70-
</ItemGroup>
71-
7246
<!-- Work around https://github.com/dotnet/cli/issues/11378. -->
7347
<Target Name="_WorkaroundNetStandard" AfterTargets="ResolvePackageAssets">
7448
<ItemGroup>

0 commit comments

Comments
 (0)