Skip to content

Commit b3c5c9a

Browse files
Fix loading of net6.0 6.0.x
1 parent 9bf5246 commit b3c5c9a

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# 1.2.1
2+
* Support for net6.0 version 6.0.1
3+
14
# 1.1.0
25
* Support for net 6.0
36

src/fasmi/Compilation.fs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,13 @@ let compile (path: string) (asmPath: string) =
4040
let net50Path =
4141
let runtimeDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
4242
#if NET6_0
43-
IO.Path.GetFullPath(runtimeDir </> "../../../packs/Microsoft.NETCore.App.Ref/6.0.0/ref/net6.0/")
43+
44+
let packDir =
45+
IO.Directory.GetDirectories(runtimeDir </> "../../../packs/Microsoft.NETCore.App.Ref/", "6.0.*")
46+
|> Seq.max
47+
IO.Path.GetFullPath(packDir </> "ref/net6.0")
48+
49+
//IO.Path.GetFullPath(runtimeDir </> "../../../packs/Microsoft.NETCore.App.Ref/6.0.0/ref/net6.0/")
4450
#else
4551
IO.Path.GetFullPath(runtimeDir </> "../../../packs/Microsoft.NETCore.App.Ref/5.0.0/ref/net5.0/")
4652
#endif

src/fasmi/fasmi.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageProjectUrl>https://github.com/d-edge/fasmi</PackageProjectUrl>
1818
<RepositoryUrl>https://github.com/d-edge/fasmi</RepositoryUrl>
1919
<PackageLicenseFile>LICENSE</PackageLicenseFile>
20-
<Version>1.2.0</Version>
20+
<Version>1.2.1</Version>
2121
</PropertyGroup>
2222
<ItemGroup>
2323
<Compile Include="FileSystem.fs" />

0 commit comments

Comments
 (0)