Skip to content

Compat fix for 6258 and fix deterministic flag #6295

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.

Sign up for GitHub

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

Merged
dsyme merged 7 commits into from
Mar 1, 2019
Merged

Compat fix for 6258 and fix deterministic flag #6295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
05d9a06
Make .NET Desktop fsi.exe 32-bit again and make Desktop fsiAnyCpu.exe…
dsyme Feb 10, 2019
0abe361
make fsc.exe 32-bit for compat
dsyme Feb 28, 2019
863c50c
make fsc.exe 32-bit for compat
dsyme Feb 28, 2019
da9f58c
improve diagnostics
dsyme Feb 28, 2019
8a14d5e
fix tests
dsyme Feb 28, 2019
e00e1db
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Feb 28, 2019
f41723a
fix determinism
dsyme Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
make fsc.exe 32-bit for compat
  • Loading branch information
@dsyme
dsyme committed Feb 28, 2019
commit 863c50ce9d4b39e56dfc04df7153b8972eda879a
5 changes: 4 additions & 1 deletion src/fsharp/fsc/fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<UseFSharpProductVersion>true</UseFSharpProductVersion>
<UseAssetTargetFallback>true</UseAssetTargetFallback>
<NGenBinary>true</NGenBinary>
<PlatformTarget Condition=" '$(TargetDotnetProfile)'!='coreclr'">x86</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/fsi/fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
<PlatformTarget>x86</PlatformTarget>
<DefineConstants>$(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER</DefineConstants>
</PropertyGroup>
Expand Down