-
Notifications
You must be signed in to change notification settings - Fork 789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make FSharp.Build build netstandard2.0 #10626
Changes from 6 commits
285c2c7
f57ed70
6caa5c1
c2e10d7
915b54b
7ce1059
30577a2
3ac46ab
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,15 +4,15 @@ | |
|
||
<PropertyGroup> | ||
<OutputType>Library</OutputType> | ||
<TargetFrameworks Condition="'$(ProtoTargetFramework)' != ''">$(ProtoTargetFramework)</TargetFrameworks> | ||
<TargetFrameworks Condition="'$(ProtoTargetFramework)' == ''">net472;netcoreapp3.1</TargetFrameworks> | ||
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netcoreapp3.1</TargetFrameworks> | ||
<TargetFramework Condition="'$(Configuration)' != 'Proto'">netstandard2.0</TargetFramework> | ||
<TargetFrameworks Condition="'$(Configuration)' == 'Proto'">netstandard2.0</TargetFrameworks> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These should be collapsed into a single There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @brettfo , yeah ... no. We publish and publish requires either a single tfm or a specified framework, I couldn't figure out how to specify a framework on the unix build. |
||
<AssemblyName>FSharp.Build</AssemblyName> | ||
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn> | ||
<AllowCrossTargeting>true</AllowCrossTargeting> | ||
<OtherFlags>$(OtherFlags) --maxerrors:20 --extraoptimizationloops:1</OtherFlags> | ||
<NGenBinary>true</NGenBinary> | ||
<DefineConstants>$(DefineConstants);LOCALIZATION_FSBUILD</DefineConstants> | ||
<NoWarn>NU1701;FS0075</NoWarn> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
|
@@ -49,10 +49,10 @@ | |
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" /> | ||
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> | ||
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> | ||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> | ||
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="all" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keep the package name and variable name in sync. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ooo good eyes. |
||
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="all" /> | ||
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" PrivateAssets="all" /> | ||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" PrivateAssets="all" /> | ||
<PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" /> | ||
</ItemGroup> | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,6 @@ | |
<PropertyGroup> | ||
<OutputType>Library</OutputType> | ||
<TargetFrameworks>net472;netstandard2.0</TargetFrameworks> | ||
<TargetFrameworks Condition="'$(OS)' == 'Unix'">netstandard2.0</TargetFrameworks> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Doesn't this cause it to fail on mac/linux? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it was a mistake, I need to revert it. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Although no, it doesn't and I don't really understand why. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @brettfo, you can build net472 on linux. You can't run it, but you can for sure build it. |
||
<AssemblyName>FSharp.Compiler.Interactive.Settings</AssemblyName> | ||
<NoWarn>$(NoWarn);45;55;62;75;1182;1204</NoWarn> | ||
<AllowCrossTargeting>true</AllowCrossTargeting> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,7 +17,7 @@ | |
<AdditionalProperties>TargetFramework=netcoreapp3.1</AdditionalProperties> | ||
</ProjectReference> | ||
<ProjectReference Include="..\FSharp.Build\FSharp.Build.fsproj"> | ||
<AdditionalProperties>TargetFramework=netcoreapp3.1</AdditionalProperties> | ||
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the TFM of FSharp.Build is only netstandard2.0, this shouldn't be necessary. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah you would think .... however ... the proto project is a bit wierder than it looks, like above we can get together and you can experience the wierdness if you like. |
||
</ProjectReference> | ||
<ProjectReference Include="..\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj"> | ||
<AdditionalProperties>TargetFramework=netstandard2.0</AdditionalProperties> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can this now be moved to the upper property group unconditionally?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm, this is proto.proj, was this intended?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it was