Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitdbc718c

Browse files
authored
Cherrypick Fix CI build to 15.9 (dotnet#5588)
* create the F# SDK package from all existing NuGet packagesAlso fix a bug where we were mis-packing the current FSharp.Core 4.5 as 4.4.3.* Merge
1 parent6d3a2c6 commitdbc718c

File tree

11 files changed

+74
-27
lines changed

11 files changed

+74
-27
lines changed

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
rem Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
2-
@if"%_echo%"==""echooff
2+
@if"%_echo%"==""echooff
33

44
setlocalenableDelayedExpansion
55

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
1818

1919
<!-- Microsoft Build packages-->
20-
<MicrosoftBuildOverallPackagesVersion>15.6.85</MicrosoftBuildOverallPackagesVersion>
20+
<MicrosoftBuildOverallPackagesVersion>15.8.166</MicrosoftBuildOverallPackagesVersion>
2121
<MicrosoftBuildPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildPackageVersion>
2222
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildFrameworkPackageVersion>
2323
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildOverallPackagesVersion)</MicrosoftBuildTasksCorePackageVersion>

‎fcs/FSharp.Compiler.Service.Tests/App.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<runtime>
44
<legacyUnhandledExceptionPolicyenabled="true" />
55
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
6+
<dependentAssembly>
7+
<assemblyIdentityname="FSharp.Core"publicKeyToken="b03f5f7f11d50a3a"culture="neutral"/>
8+
<bindingRedirectoldVersion="2.0.0.0-4.5.0.0"newVersion="4.5.0.0"/>
9+
</dependentAssembly>
610
</assemblyBinding>
711
</runtime>
812
<startup>

‎packages.config‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@
2626
<packageid="Microsoft.Build.Utilities.Core"version="14.3.0" />
2727
<packageid="Microsoft.Build.Tasks.Core"version="14.3.0" />
2828

29+
<packageid="Microsoft.Build"version="15.8.166" />
30+
<packageid="Microsoft.Build.Framework"version="15.8.166" />
31+
<packageid="Microsoft.Build.Utilities.Core"version="15.8.166" />
32+
<packageid="Microsoft.Build.Tasks.Core"version="15.8.166" />
33+
<packageid="System.IO.Compression"version="4.3.0" />
34+
2935
<!-- Testing-->
3036
<packageid="FsCheck"version="3.0.0-alpha3" />
3137
<packageid="NUnit"version="3.5.0"targetFramework="net45" />

‎setup/Swix/Microsoft.FSharp.SDK/Files.swr‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
1717
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.sigdata"
1818
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.7.4.0\FSharp.Core.xml"
1919
folder "3.7.41.0"
20-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.dll"
21-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.optdata"
22-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.sigdata"
23-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45\FSharp.Core.xml"
20+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.dll"
21+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.optdata"
22+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.sigdata"
23+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45\FSharp.Core.xml"
2424
folder "3.78.3.1"
2525
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.dll"
2626
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.3.1\FSharp.Core.optdata"
@@ -32,10 +32,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
3232
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.sigdata"
3333
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.78.4.0\FSharp.Core.xml"
3434
folder "3.78.41.0"
35-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll"
36-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata"
37-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata"
38-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wp8\FSharp.Core.xml"
35+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.dll"
36+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.optdata"
37+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.sigdata"
38+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wp8\FSharp.Core.xml"
3939
folder "3.259.3.1"
4040
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.dll"
4141
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.3.1\FSharp.Core.optdata"
@@ -47,10 +47,10 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
4747
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.sigdata"
4848
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETCore\3.259.4.0\FSharp.Core.xml"
4949
folder "3.259.41.0"
50-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll"
51-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata"
52-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata"
53-
file source="$(BinariesFolder)\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml"
50+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.dll"
51+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.optdata"
52+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.sigdata"
53+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+netcore45+wpa81+wp8\FSharp.Core.xml"
5454

5555
folder ".NETFramework\v4.0"
5656
folder "4.3.0.0"
@@ -69,15 +69,15 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
6969
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.sigdata"
7070
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETFramework\v4.0\4.4.0.0\FSharp.Core.xml"
7171
folder "4.4.1.0"
72-
file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.dll"
73-
file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.optdata"
74-
file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.sigdata"
75-
file source="$(BinariesFolder)\versions\4.4.1.0\FSharp.Core.xml"
72+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.dll"
73+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.optdata"
74+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.sigdata"
75+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\versions\4.4.1.0\FSharp.Core.xml"
7676
folder "4.4.3.0"
77-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.dll"
78-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.optdata"
79-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.sigdata"
80-
file source="$(BinariesFolder)\net40\bin\FSharp.Core.xml"
77+
file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll"
78+
file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.optdata"
79+
file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.sigdata"
80+
file source="$(PackagesFolder)\FSharp.Core.4.3.4\lib\net45\FSharp.Core.xml"
8181

8282
folder ".NETPortable"
8383
folder "2.3.5.0"
@@ -96,7 +96,7 @@ folder "InstallDir:Common7\IDE\CommonExtensions\Microsoft\FSharpSdk"
9696
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.sigdata"
9797
file source="$(PackagesFolder)\Microsoft.VisualFSharp.Core.Redist.1.0.0\content\.NETPortable\3.47.4.0\FSharp.Core.xml"
9898
folder "3.47.41.0"
99-
file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll"
100-
file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata"
101-
file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata"
102-
file source="$(BinariesFolder)\profiles\portable-net45+sl5+netcore45\FSharp.Core.xml"
99+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.dll"
100+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.optdata"
101+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.sigdata"
102+
file source="$(PackagesFolder)\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\portable-net45+sl5+netcore45\FSharp.Core.xml"

‎setup/Swix/Microsoft.FSharp.SDK/Microsoft.FSharp.SDK.swixproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ImportProject="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
1919

2020
<PropertyGroup>
21-
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);BinariesFolder=$(BinariesFolder)</PackagePreprocessorDefinitions>
2221
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);PackagesFolder=$(PackagesFolder)</PackagePreprocessorDefinitions>
2322
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);FSharpPackageVersion=$(FSharpPackageVersion)</PackagePreprocessorDefinitions>
2423
</PropertyGroup>

‎setup/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@
1111
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
1212
<packageid="System.ValueTuple"version="4.4.0" />
1313
<packageid="Microsoft.VisualFSharp.Type.Providers.Redist"version="1.0.0" />
14+
<packageid="Microsoft.Portable.FSharp.Core"version="10.1.0" />
15+
<packageid="FSharp.Core"version="4.3.4" />
1416
</packages>
833 KB
Binary file not shown.

‎tests/service/data/FSharp.Data.dll‎

251 KB
Binary file not shown.

‎vsintegration/tests/UnitTests/LegacyProjectSystem/Tests.ProjectSystem.Configs.fs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ open NUnit.Framework
1313
// VS namespaces
1414
openMicrosoft.VisualStudio
1515
openMicrosoft.VisualStudio.Shell.Interop
16+
openMicrosoft.VisualStudio.FSharp
1617
openMicrosoft.VisualStudio.FSharp.ProjectSystem
1718

1819
// Internal unittest namespaces
@@ -22,6 +23,12 @@ open UnitTests.TestLib.Utils.FilesystemHelpers
2223
openUnitTests.TestLib.ProjectSystem
2324

2425

26+
[<SetUpFixture>]
27+
typepublicAssemblyResolverTestFixture()=
28+
29+
[<OneTimeSetUp>]
30+
memberpublic__.Init()= AssemblyResolver.addResolver()
31+
2532
[<TestFixture>][<Category"ProjectSystem">]
2633
typeConfig()=
2734
inherit TheTests()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp