Skip to content

Commit a2efe03

Browse files
enricosadaenricosada
committed
update deps to .NET Core 1.0 RTM
System.Security.Cryptography.Algorithms depends on System.Security.Cryptography.Primitives, removed explicit Microsoft.NETCore.Runtime.CoreCLR 1.0.2 depends on Microsoft.NETCore.Windows.ApiSets 1.0.1, remove explicit System.Reflection.Emit 4.0.1 depends on System.Reflection.Emit.ILGeneration 4.0.1, removed explicit bump from System.Linq.Expressions 4.0.11-rc2-23911 to version 4.1.0 ( 1.0 RTM ) bump from System.Text.RegularExpressions 4.0.12-rc2-24027 to 4.1.0 ( 1.0 RTM ) support osx is 10.11 now, instead of 10.10 update System.Runtime.InteropServices.PInvoke to 4.0.0-rc2-24027 ?? no RTM??
1 parent 8dcde4f commit a2efe03

File tree

9 files changed

+125
-130
lines changed

9 files changed

+125
-130
lines changed

‎src/fsharp/FSharp.Build/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"System.AppContext": "4.1.0-rc2-24027",
1313
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
1414
"System.Reflection.Primitives": "4.0.1-rc2-24027",
15-
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
15+
"System.Resources.ResourceManager": "4.0.1-rc2-24027"
1616
},
1717
"frameworks": {
1818
"dnxcore50": {
19-
"imports": "portable-net45+win8",
19+
"imports": "portable-net45+win8"
2020
}
2121
}
2222
}

‎src/fsharp/FSharp.Compiler.Host.netcore.nuget/Microsoft.FSharp.Compiler.Host.netcore.nuspec‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<metadata>
44
<id>Microsoft.FSharp.Compiler.Host.netcore</id>
55
<description>
6-
netcore compatible version of the fsharp compiler fsc.exe.
6+
.NET Core compatible version of the fsharp compiler fsc.exe.
77

88
Supported Platforms:
9-
- .NET Core (netstandard1.5)
9+
- .NET Core (netstandard1.6)
1010
</description>
1111
<language>en-US</language>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -16,12 +16,11 @@
1616
<projectUrl>$projectUrl$</projectUrl>
1717
<tags>$tags$</tags>
1818
<dependencies>
19-
<group targetFramework=".NETStandard1.5">
20-
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1-rc2-23911" />
21-
<dependency id="Microsoft.NETCore.Runtime.CoreCLR" version="1.0.2-rc2-23911" />
19+
<group targetFramework=".NETStandard1.6">
20+
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
21+
<dependency id="Microsoft.NETCore.Runtime.CoreCLR" version="1.0.2" />
2222
<dependency id="Microsoft.NETCore" version="5.0.1-rc2-23911" />
2323
<dependency id="Microsoft.NETCore.ConsoleHost" version="1.0.0-rc2-23911" />
24-
<dependency id="Microsoft.NETCore.Windows.ApiSets" version="1.0.1-rc2-23911" />
2524
<dependency id="Microsoft.FSharp.Compiler.NetCore" version="$version$" />
2625
</group>
2726
</dependencies>

‎src/fsharp/FSharp.Compiler.Interactive.Settings/project.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"NETStandard.Library": "1.5.0-rc2-24027",
5-
"System.Linq.Expressions": "4.0.11-rc2-24027",
6-
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
7-
"System.Runtime.Loader": "4.0.0-rc2-24027",
8-
"System.Threading.Thread": "4.0.0-rc2-24027",
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"NETStandard.Library": "1.6.0",
5+
"System.Linq.Expressions": "4.1.0",
6+
"System.Reflection.TypeExtensions": "4.1.0",
7+
"System.Runtime.Loader": "4.0.0",
8+
"System.Threading.Thread": "4.0.0"
99
},
1010
"runtimes": {
1111
"win7-x86": { },
1212
"win7-x64": { },
13-
"osx.10.10-x64": { },
13+
"osx.10.11-x64": { },
1414
"ubuntu.14.04-x64": { }
1515
},
1616
"frameworks": {
17-
"netstandard1.5": { }
17+
"netstandard1.6": { }
1818
}
1919
}

‎src/fsharp/FSharp.Compiler.netcore.nuget/Microsoft.FSharp.Compiler.netcore.nuspec‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<metadata>
44
<id>Microsoft.FSharp.Compiler.netcore</id>
55
<description>
6-
netcore compatible version of the fsharp compiler fsc.exe.
7-
Supported Platforms: - .NET Core (.netstandard1.5)
6+
.NET Core compatible version of the fsharp compiler fsc.exe.
7+
Supported Platforms: - .NET Core (.netstandard1.6)
88
</description>
99
<language>en-US</language>
1010
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -14,37 +14,35 @@
1414
<projectUrl>$projectUrl$</projectUrl>
1515
<tags>$tags$</tags>
1616
<dependencies>
17-
<group targetFramework=".NETStandard1.5">
17+
<group targetFramework=".NETStandard1.6">
1818
<dependency id="Microsoft.FSharp.Core.netcore" version="$version$" />
19-
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1-rc2-23911" />
20-
<dependency id="NETStandard.Library" version="1.5.0-rc2-23911" />
21-
<dependency id="System.Collections.Immutable" version="1.2.0-rc2-23911" />
22-
<dependency id="System.Diagnostics.Process" version="4.1.0-rc2-23911" />
23-
<dependency id="System.Diagnostics.TraceSource" version="4.0.0-rc2-23911" />
24-
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-23911" />
25-
<dependency id="System.Linq.Queryable" version="4.0.1-rc2-23911" />
26-
<dependency id="System.Net.Requests" version="4.0.11-rc2-23911" />
27-
<dependency id="System.Reflection.Emit" version="4.0.1-rc2-23911" />
28-
<dependency id="System.Reflection.Emit.ILGeneration" version="4.0.1-rc2-23911" />
29-
<dependency id="System.Reflection.Metadata" version="1.3.0-rc2-23911" />
30-
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc2-23911" />
31-
<dependency id="System.Runtime.InteropServices.PInvoke" version="4.0.0-rc2-23911" />
32-
<dependency id="System.Runtime.Loader" version="4.0.0-rc2-23911" />
33-
<dependency id="System.Security.Cryptography.Algorithms" version="4.1.0-rc2-23911" />
34-
<dependency id="System.Security.Cryptography.Primitives" version="4.0.0-rc2-23911" />
35-
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-23911" />
36-
<dependency id="System.Threading.Thread" version="4.0.0-rc2-23911" />
37-
<dependency id="System.Threading.ThreadPool" version="4.0.10-rc2-23911" />
38-
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.0.0-rc-60301" />
39-
<dependency id="Microsoft.DiaSymReader" version="1.0.7" />
19+
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
20+
<dependency id="NETStandard.Library" version="1.6.0" />
21+
<dependency id="System.Collections.Immutable" version="1.2.0" />
22+
<dependency id="System.Diagnostics.Process" version="4.1.0" />
23+
<dependency id="System.Diagnostics.TraceSource" version="4.0.0" />
24+
<dependency id="System.Linq.Expressions" version="4.1.0" />
25+
<dependency id="System.Linq.Queryable" version="4.0.1" />
26+
<dependency id="System.Net.Requests" version="4.0.11" />
27+
<dependency id="System.Reflection.Emit" version="4.0.1" />
28+
<dependency id="System.Reflection.Metadata" version="1.3.0" />
29+
<dependency id="System.Runtime.InteropServices" version="4.1.0" />
30+
<dependency id="System.Runtime.InteropServices.PInvoke" version="4.0.0-rc2-24027" />
31+
<dependency id="System.Runtime.Loader" version="4.0.0" />
32+
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0" />
33+
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1" />
34+
<dependency id="System.Threading.Thread" version="4.0.0" />
35+
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
36+
<dependency id="Microsoft.DiaSymReader.PortablePdb" version="1.1.0" />
37+
<dependency id="Microsoft.DiaSymReader" version="1.0.8" />
4038
</group>
4139
</dependencies>
4240
</metadata>
4341
<files>
44-
<file src="fsc.exe" target="lib/netstandard1.5" />
45-
<file src="FSharp.Compiler.dll" target="lib/netstandard1.5" />
42+
<file src="fsc.exe" target="lib/netstandard1.6" />
43+
<file src="FSharp.Compiler.dll" target="lib/netstandard1.6" />
4644
<file src="default.win32manifest" target="runtimes/any/native/" />
47-
<file src="fsi.exe" target="lib/netstandard1.5" />
48-
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.5" />
45+
<file src="fsi.exe" target="lib/netstandard1.6" />
46+
<file src="FSharp.Compiler.Interactive.Settings.dll" target="lib/netstandard1.6" />
4947
</files>
5048
</package>

‎src/fsharp/FSharp.Compiler/project.json‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"NETStandard.Library": "1.5.0-rc2-24027",
5-
"System.Collections.Immutable":"1.2.0-rc2-24027",
6-
"System.Diagnostics.Process": "4.1.0-rc2-24027",
7-
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
8-
"System.Linq.Expressions": "4.0.11-rc2-24027",
9-
"System.Linq.Queryable": "4.0.1-rc2-24027",
10-
"System.Net.Requests": "4.0.11-rc2-24027",
11-
"System.Reflection.Emit": "4.0.1-rc2-24027",
12-
"System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
13-
"System.Reflection.Metadata": "1.3.0-rc2-24027",
14-
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
15-
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"NETStandard.Library": "1.6.0",
5+
"System.Collections.Immutable":"1.2.0",
6+
"System.Diagnostics.Process": "4.1.0",
7+
"System.Diagnostics.TraceSource": "4.0.0",
8+
"System.Linq.Expressions": "4.1.0",
9+
"System.Linq.Queryable": "4.0.1",
10+
"System.Net.Requests": "4.0.11",
11+
"System.Reflection.Emit": "4.0.1",
12+
"System.Reflection.Metadata": "1.3.0",
13+
"System.Reflection.TypeExtensions": "4.1.0",
14+
"System.Runtime.InteropServices": "4.1.0",
1615
"System.Runtime.InteropServices.PInvoke": "4.0.0-rc2-24027",
17-
"System.Runtime.Loader": "4.0.0-rc2-24027",
18-
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
19-
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
20-
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
21-
"System.Threading.Thread": "4.0.0-rc2-24027",
22-
"System.Threading.ThreadPool": "4.0.10-rc2-24027",
23-
"Microsoft.DiaSymReader.PortablePdb": "1.0.0-rc-60301",
24-
"Microsoft.DiaSymReader": "1.0.7",
16+
"System.Runtime.Loader": "4.0.0",
17+
"System.Security.Cryptography.Algorithms": "4.2.0",
18+
"System.Threading.Tasks.Parallel": "4.0.1",
19+
"System.Threading.Thread": "4.0.0",
20+
"System.Threading.ThreadPool": "4.0.10",
21+
"Microsoft.DiaSymReader.PortablePdb": "1.1.0",
22+
"Microsoft.DiaSymReader": "1.0.8"
2523
},
2624
"runtimes": {
2725
"win7-x86": { },
2826
"win7-x64": { },
29-
"osx.10.10-x64": { },
27+
"osx.10.11-x64": { },
3028
"ubuntu.14.04-x64": { }
3129
},
3230
"frameworks": {
33-
"netstandard1.5": {
31+
"netstandard1.6": {
3432
"imports": "portable-net45+win8"
3533
}
3634
}

‎src/fsharp/FSharp.Core/project.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"Microsoft.NETCore.Runtime": "1.0.2-rc2-24027",
5-
"System.Collections": "4.0.11-rc2-24027",
6-
"System.Console": "4.0.0-rc2-24027",
7-
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
8-
"System.Diagnostics.Tools": "4.0.1-rc2-24027",
9-
"System.Globalization": "4.0.11-rc2-24027",
10-
"System.IO": "4.1.0-rc2-24027",
11-
"System.Linq": "4.1.0-rc2-24027",
12-
"System.Linq.Expressions": "4.0.11-rc2-24027",
13-
"System.Linq.Queryable": "4.0.1-rc2-24027",
14-
"System.Net.Requests": "4.0.11-rc2-24027",
15-
"System.Reflection": "4.1.0-rc2-24027",
16-
"System.Reflection.Extensions": "4.0.1-rc2-24027",
17-
"System.Resources.ResourceManager":"4.0.1-rc2-24027",
18-
"System.Runtime": "4.1.0-rc2-24027",
19-
"System.Runtime.Extensions": "4.1.0-rc2-24027",
20-
"System.Runtime.Numerics": "4.0.1-rc2-24027",
21-
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
22-
"System.Threading": "4.0.11-rc2-24027",
23-
"System.Threading.Tasks": "4.0.11-rc2-24027",
24-
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
25-
"System.Threading.Thread": "4.0.0-rc2-24027",
26-
"System.Threading.ThreadPool": "4.0.10-rc2-24027",
27-
"System.Threading.Timer": "4.0.1-rc2-24027"
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"Microsoft.NETCore.Runtime": "1.0.2",
5+
"System.Collections": "4.0.11",
6+
"System.Console": "4.0.0",
7+
"System.Diagnostics.Debug": "4.0.11",
8+
"System.Diagnostics.Tools": "4.0.1",
9+
"System.Globalization": "4.0.11",
10+
"System.IO": "4.1.0",
11+
"System.Linq": "4.1.0",
12+
"System.Linq.Expressions": "4.1.0",
13+
"System.Linq.Queryable": "4.0.1",
14+
"System.Net.Requests": "4.0.11",
15+
"System.Reflection": "4.1.0",
16+
"System.Reflection.Extensions": "4.0.1",
17+
"System.Resources.ResourceManager":"4.0.1",
18+
"System.Runtime": "4.1.0",
19+
"System.Runtime.Extensions": "4.1.0",
20+
"System.Runtime.Numerics": "4.0.1",
21+
"System.Text.RegularExpressions": "4.1.0",
22+
"System.Threading": "4.0.11",
23+
"System.Threading.Tasks": "4.0.11",
24+
"System.Threading.Tasks.Parallel": "4.0.1",
25+
"System.Threading.Thread": "4.0.0",
26+
"System.Threading.ThreadPool": "4.0.10",
27+
"System.Threading.Timer": "4.0.1"
2828
},
2929
"runtimes": {
3030
"win7-x86": { },
3131
"win7-x64": { },
32-
"osx.10.10-x64": { },
32+
"osx.10.11-x64": { },
3333
"ubuntu.14.04-x64": { }
3434
},
3535
"frameworks": {
36-
"netstandard1.5": { }
36+
"netstandard1.6": { }
3737
}
3838
}

‎src/fsharp/Fsc/project.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"NETStandard.Library": "1.5.0-rc2-24027",
5-
"System.Linq.Expressions": "4.0.11-rc2-24027",
6-
"System.Reflection.Metadata": "1.3.0-rc2-24027",
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"NETStandard.Library": "1.6.0",
5+
"System.Linq.Expressions": "4.1.0",
6+
"System.Reflection.Metadata": "1.3.0"
77
},
88
"runtimes": {
99
"win7-x86": { },
1010
"win7-x64": { },
11-
"osx.10.10-x64": { },
11+
"osx.10.11-x64": { },
1212
"ubuntu.14.04-x64": { }
1313
},
1414
"frameworks": {
15-
"netstandard1.5": { }
15+
"netstandard1.6": { }
1616
}
1717
}

‎src/fsharp/fsharp.core.netcore.nuget/Microsoft.FSharp.Core.netcore.nuspec‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<metadata>
44
<id>Microsoft.FSharp.Core.netcore</id>
55
<description>
6-
netcore compatible version of the fsharp core library fsharp.core.dll
7-
Supported Platforms: - .NET Core (netstandard1.5)
6+
.NET Core compatible version of the fsharp core library fsharp.core.dll
7+
Supported Platforms: - .NET Core (netstandard1.6)
88
</description>
99
<language>en-US</language>
1010
<requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -15,27 +15,27 @@
1515
<tags>$tags$</tags>
1616
<dependencies>
1717
<group targetFramework=".NETStandard1.5">
18-
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1-rc2-23911" />
19-
<dependency id="NETStandard.Library" version="1.5.0-rc2-23911" />
20-
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-23911" />
21-
<dependency id="System.Linq.Queryable" version="4.0.1-rc2-23805" />
22-
<dependency id="System.Reflection.Emit" version="4.0.1-rc2-23911" />
23-
<dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-23911" />
24-
<dependency id="System.Runtime.Loader" version="4.0.0-rc2-23911" />
25-
<dependency id="System.Net.Requests" version= "4.0.11-rc2-23911" />
26-
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc2-23911" />
27-
<dependency id="System.Threading.Thread" version="4.0.0-rc2-23911" />
28-
<dependency id="System.Threading.ThreadPool" version="4.0.10-rc2-23911" />
18+
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
19+
<dependency id="NETStandard.Library" version="1.6.0" />
20+
<dependency id="System.Linq.Expressions" version="4.1.0" />
21+
<dependency id="System.Linq.Queryable" version="4.0.1" />
22+
<dependency id="System.Reflection.Emit" version="4.0.1" />
23+
<dependency id="System.Reflection.TypeExtensions" version="4.1.0" />
24+
<dependency id="System.Runtime.Loader" version="4.0.0" />
25+
<dependency id="System.Net.Requests" version= "4.0.11" />
26+
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1" />
27+
<dependency id="System.Threading.Thread" version="4.0.0" />
28+
<dependency id="System.Threading.ThreadPool" version="4.0.10" />
2929
</group>
3030
</dependencies>
3131
</metadata>
3232
<files>
33-
<file src="FSharp.Core.dll" target="lib/netstandard1.5" />
34-
<file src="FSharp.Core.sigdata" target="lib/netstandard1.5" />
35-
<file src="FSharp.Core.optdata" target="lib/netstandard1.5" />
36-
<file src="FSharp.Core.runtimeconfig.json" target="lib/netstandard1.5" />
37-
<file src="FSharp.Core.sigdata" target="content/any/netstandard1.5" />
38-
<file src="FSharp.Core.optdata" target="content/any/netstandard1.5" />
33+
<file src="FSharp.Core.dll" target="lib/netstandard1.6" />
34+
<file src="FSharp.Core.sigdata" target="lib/netstandard1.6" />
35+
<file src="FSharp.Core.optdata" target="lib/netstandard1.6" />
36+
<file src="FSharp.Core.runtimeconfig.json" target="lib/netstandard1.6" />
37+
<file src="FSharp.Core.sigdata" target="content/any/netstandard1.6" />
38+
<file src="FSharp.Core.optdata" target="content/any/netstandard1.6" />
3939
<file src="FSharp.Core.sigdata" target="runtimes/any/native/" />
4040
<file src="FSharp.Core.optdata" target="runtimes/any/native/" />
4141
</files>

‎src/fsharp/fsi/project.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
4-
"NETStandard.Library": "1.5.0-rc2-24027",
5-
"System.Diagnostics.Process": "4.1.0-rc2-24027",
6-
"System.Linq.Expressions": "4.0.11-rc2-24027",
7-
"System.Reflection.Emit": "4.0.1-rc2-24027",
8-
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
9-
"System.Runtime.Loader": "4.0.0-rc2-24027",
10-
"System.Threading.Thread": "4.0.0-rc2-24027",
11-
"System.Reflection.Metadata": "1.3.0-rc2-24027",
3+
"Microsoft.NETCore.Platforms": "1.0.1",
4+
"NETStandard.Library": "1.6.0",
5+
"System.Diagnostics.Process": "4.1.0",
6+
"System.Linq.Expressions": "4.1.0",
7+
"System.Reflection.Emit": "4.0.1",
8+
"System.Reflection.TypeExtensions": "4.1.0",
9+
"System.Runtime.Loader": "4.0.0",
10+
"System.Threading.Thread": "4.0.0",
11+
"System.Reflection.Metadata": "1.3.0"
1212
},
1313
"runtimes": {
1414
"win7-x86": { },
1515
"win7-x64": { },
16-
"osx.10.10-x64": { },
16+
"osx.10.11-x64": { },
1717
"ubuntu.14.04-x64": { }
1818
},
1919
"frameworks": {
20-
"netstandard1.5": { }
20+
"netstandard1.6": { }
2121
}
2222
}

0 commit comments

Comments
 (0)