Skip to content

Commit 9eeaa25

Browse files
authored
Do it properly (#8373)
1 parent 1cc3555 commit 9eeaa25

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

src/fsharp/FSharp.DependencyManager/FSharp.DependencyManager.fsproj

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks>
8-
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
98
<AssemblyName>FSharp.DependencyManager</AssemblyName>
109
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1110
<AllowCrossTargeting>true</AllowCrossTargeting>
@@ -19,16 +18,6 @@
1918
<PropertyGroup>
2019
<BuildOutputGroupLocation>$(BaseOutputPath)\$(Configuration)\$(TargetFramework)</BuildOutputGroupLocation>
2120
</PropertyGroup>
22-
23-
<ItemGroup>
24-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Framework.dll" />
25-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.dll" />
26-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Utilities.Core.dll" />
27-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\Microsoft.Build.Tasks.Core.dll" />
28-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Collections.Immutable.dll" />
29-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Reflection.Metadata.dll" />
30-
<BuiltProjectOutputGroupKeyOutput Include="$(BuildOutputGroupLocation)\System.Threading.Tasks.Dataflow.dll" />
31-
</ItemGroup>
3221
</Target>
3322

3423
<ItemGroup>
@@ -41,18 +30,6 @@
4130

4231
<ItemGroup>
4332
<ProjectReference Include="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
44-
</ItemGroup>
45-
46-
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
47-
<Reference Include="ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
48-
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
49-
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
50-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
51-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
52-
<PackageReference Include="System.IO.Compression" Version="$(SystemIoCompressionVersion)" />
53-
</ItemGroup>
54-
55-
<ItemGroup Condition="$(TargetFramework.Startswith('netstandard'))">
5633
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
5734
</ItemGroup>
5835

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<NgenArchitecture>All</NgenArchitecture>
9292
<NgenPriority>2</NgenPriority>
9393
<Private>True</Private>
94-
<AdditionalProperties>TargetFramework=net472</AdditionalProperties>
94+
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties>
9595
</ProjectReference>
9696
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj">
9797
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>

0 commit comments

Comments
 (0)