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

Commit7aa7cd3

Browse files
authored
Merge pull requestdotnet#4877 from Microsoft/merge-dev15.7-to-master
Merge dev15.7 to master
2 parentsb76fa9f +0a105c9 commit7aa7cd3

File tree

42 files changed

+353
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+353
-83
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ scripts/*.patch
6363
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
6464
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
6565
/tests/Xnet40-fsharpqa-suite-failures.log.*
66+
/tests/fsharp/typeProviders/splitAssemblyTools/provider.dll
67+
/tests/fsharp/typeProviders/splitAssemblyTypeproviders/provider.dll
6668
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
6769
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
6870
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll

‎PublishToBlob.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<!-- this should pick up both *.nupkg and *.symbols.nupkg-->
20-
<NuGetPackagesInclude="$(MSBuildThisFileDirectory)artifacts\Microsoft.FSharp.Compiler.*.nupkg" />
20+
<NuGetPackagesInclude="$(MSBuildThisFileDirectory)$(Configuration)\artifacts\Microsoft.FSharp.Compiler.*.nupkg" />
2121
</ItemGroup>
2222

2323
<TargetName="Build">

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.0-beta3-62720-08
1+
2.8.0-beta1-62707-12

‎build-everything.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777

7878
<ItemGroupCondition="'$(TEST_NET40_FSHARP_SUITE)'=='1'" >
7979
<ProjectsWithNet40Include="tests/fsharp/FSharp.Tests.FSharpSuite.fsproj" />
80+
<ProjectsWithNet40Include="tests/fsharp/SDKTests/AllSdkTargetsTests.proj" />
8081
</ItemGroup>
8182

8283
<ItemGroupCondition="'$(TEST_CORECLR_FSHARP_SUITE)'=='1'" >

‎build/targets/AssemblyVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<FSCoreVersion>4.4.3.0</FSCoreVersion>
2323
<FSProductVersion>10.1.1.0</FSProductVersion>
2424
<FSPackageVersion>10.1.4</FSPackageVersion>
25-
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
25+
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
2626
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
2727

2828
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,18 @@
4848
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
4949
<Private>false</Private>
5050
</Reference>
51+
<!-- we build the nuget against FSHarp.Core 4.4.0.0 instead of our latest to allow use in wider range of F# tools-->
52+
<ReferenceInclude="FSharp.Core">
53+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
54+
<Private>false</Private>
55+
</Reference>
56+
</ItemGroup>
57+
<ItemGroup>
58+
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj">
59+
<Name>FSharp.Compiler.Service</Name>
60+
<Project>{2e4d67b4-522d-4cf7-97e4-ba940f0b18f3}</Project>
61+
<Private>True</Private>
62+
</ProjectReference>
63+
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
5164
</ItemGroup>
5265
</Project>

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<CompileInclude="Program.fs" />
2121
<NoneInclude="App.config" />
2222
<NoneInclude="FSharp.Compiler.Service.ProjectCracker.targets" />
23+
<NoneInclude="paket.references" />
24+
<ReferenceInclude="FSharp.Core">
25+
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
26+
<Private>false</Private>
27+
</Reference>
2328
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
2429
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
2530
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

‎src/FSharpSource.Settings.targets‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<FSCoreVersion>4.4.3.0</FSCoreVersion>
2424
<FSProductVersion>10.1.1.0</FSProductVersion>
2525
<FSPackageVersion>10.1.4</FSPackageVersion>
26-
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
26+
<VSAssemblyVersion>15.7.0.0</VSAssemblyVersion>
2727
</PropertyGroup>
2828

2929
<PropertyGroup>
@@ -104,6 +104,10 @@
104104
<FSharpCoreLatestTargetPackageVersion>4.3.5</FSharpCoreLatestTargetPackageVersion>
105105
<FSharpCoreLatestTargetMajorVersion>4.3</FSharpCoreLatestTargetMajorVersion>
106106

107+
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
108+
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
109+
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
110+
107111
<!-- Frozen FSharp.Core package-->
108112
<FSharpCoreFrozenPortablePackageVersion>10.1.0</FSharpCoreFrozenPortablePackageVersion>
109113
<FSharpCoreFrozenPortableTargetPackageVersion>10.2.0</FSharpCoreFrozenPortableTargetPackageVersion>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
3+
<ImportProject="targets\PackageVersions.props" />
4+
5+
</Project>

‎src/buildfromsource/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<OutputType>Library</OutputType>
7-
<TargetFramework>netcoreapp1.0</TargetFramework>
7+
<TargetFramework>netstandard2.0</TargetFramework>
88
<AssemblyName>FSharp.Build</AssemblyName>
99
<NoWarn>$(NoWarn);45;55;62;75;1204</NoWarn>
1010
<AllowCrossTargeting>true</AllowCrossTargeting>
@@ -55,11 +55,14 @@
5555

5656
<ItemGroup>
5757
<ProjectReferenceInclude="$(MSBuildThisFileDirectory)..\FSharp.Core\FSharp.Core.fsproj" />
58-
<PackageReferenceInclude="Microsoft.Build"Version="15.1.548"></PackageReference>
59-
<PackageReferenceInclude="Microsoft.Build.Framework"Version="15.1.548"></PackageReference>
60-
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="15.1.548"></PackageReference>
61-
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="15.1.548"></PackageReference>
62-
<PackageReferenceInclude="Microsoft.Win32.Registry"Version="4.3.0"></PackageReference>
58+
</ItemGroup>
59+
60+
<ItemGroup>
61+
<PackageReferenceInclude="Microsoft.Build"Version="$(MicrosoftBuildPackageVersion)" />
62+
<PackageReferenceInclude="Microsoft.Build.Framework"Version="$(MicrosoftBuildFrameworkPackageVersion)" />
63+
<PackageReferenceInclude="Microsoft.Build.Tasks.Core"Version="$(MicrosoftBuildTasksCorePackageVersion)" />
64+
<PackageReferenceInclude="Microsoft.Build.Utilities.Core"Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
65+
<PackageReferenceInclude="Microsoft.Win32.Registry"Version="$(MicrosoftWin32RegistryPackageVersion)" />
6366
</ItemGroup>
6467

6568
</Project>

0 commit comments

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