Skip to content

Commit 6acca56

Browse files
committed
Remove most UndefineProperties use
- should not be necessary
1 parent 3d5202a commit 6acca56

File tree

8 files changed

+11
-22
lines changed

8 files changed

+11
-22
lines changed

src/Components/Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'"
2020
Private="false"
2121
ReferenceOutputAssemblies="false"
22-
SkipGetTargetFrameworkProperties="true"
23-
UndefineProperties="TargetFramework" />
22+
SkipGetTargetFrameworkProperties="true" />
2423
</ItemGroup>
2524

2625
<!-- blazor.webassembly.js should exist after Microsoft.AspNetCore.Components.Web.JS.npmproj builds. -->

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'"
3838
Private="false"
3939
ReferenceOutputAssembly="false"
40-
SkipGetTargetFrameworkProperties="true"
41-
UndefineProperties="TargetFramework" />
40+
SkipGetTargetFrameworkProperties="true" />
4241
</ItemGroup>
4342

4443
<PropertyGroup>

src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,17 @@
2727
Include="..\..\JSInterop\Microsoft.JSInterop.JS\src\Microsoft.JSInterop.JS.npmproj"
2828
Private="false"
2929
ReferenceOutputAssembly="false"
30-
SkipGetTargetFrameworkProperties="true"
31-
UndefineProperties="TargetFramework" />
30+
SkipGetTargetFrameworkProperties="true" />
3231
<ProjectReference
3332
Include="..\..\SignalR\clients\ts\signalr\signalr.npmproj"
3433
Private="false"
3534
ReferenceOutputAssembly="false"
36-
SkipGetTargetFrameworkProperties="true"
37-
UndefineProperties="TargetFramework" />
35+
SkipGetTargetFrameworkProperties="true" />
3836
<ProjectReference
3937
Include="..\..\SignalR\clients\ts\signalr-protocol-msgpack\signalr-protocol-msgpack.npmproj"
4038
Private="false"
4139
ReferenceOutputAssembly="false"
42-
SkipGetTargetFrameworkProperties="true"
43-
UndefineProperties="TargetFramework" />
40+
SkipGetTargetFrameworkProperties="true" />
4441
</ItemGroup>
4542

4643
<!-- Workaround strange issues with something calling these targets. -->

src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'"
2323
Private="false"
2424
ReferenceOutputAssembly="false"
25-
SkipGetTargetFrameworkProperties="true"
26-
UndefineProperties="TargetFramework" />
25+
SkipGetTargetFrameworkProperties="true" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@
4848
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'"
4949
Private="false"
5050
ReferenceOutputAssembly="false"
51-
SkipGetTargetFrameworkProperties="true"
52-
UndefineProperties="TargetFramework" />
51+
SkipGetTargetFrameworkProperties="true" />
5352
</ItemGroup>
5453

5554
<!-- This workaround is required when referencing FileProviders.Embedded as a project -->

src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@ This package is an internal implementation of the .NET Core SDK and is not meant
6767
<ProjectReference Include="..\..\AspNetCoreAnalyzers\src\Analyzers\Microsoft.AspNetCore.App.Analyzers.csproj"
6868
Private="false"
6969
ReferenceOutputAssembly="false"
70-
SkipGetTargetFrameworkProperties="true"
71-
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
70+
SkipGetTargetFrameworkProperties="true" />
7271
<ProjectReference Include="..\..\AspNetCoreAnalyzers\src\CodeFixes\Microsoft.AspNetCore.App.CodeFixes.csproj"
7372
Private="false"
7473
ReferenceOutputAssembly="false"
75-
SkipGetTargetFrameworkProperties="true"
76-
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
74+
SkipGetTargetFrameworkProperties="true" />
7775

7876
<!-- Enforce build order. Targeting pack needs to bundle analyzers and information about the runtime. -->
7977
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj"

src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
<Reference Include="Microsoft.AspNetCore.Mvc.Testing.Tasks"
2323
Private="false"
2424
ReferenceOutputAssembly="false"
25-
SkipGetTargetFrameworkProperties="true"
26-
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
25+
SkipGetTargetFrameworkProperties="true" />
2726
</ItemGroup>
2827

2928
<ItemGroup>

src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
Targets="Publish"
2424
Private="false"
2525
ReferenceOutputAssembly="false"
26-
SkipGetTargetFrameworkProperties="true"
27-
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />
26+
SkipGetTargetFrameworkProperties="true" />
2827
<Reference Include="GetDocument.Insider"
2928
Private="false"
3029
ReferenceOutputAssembly="false"

0 commit comments

Comments
 (0)