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

Commit230ec51

Browse files
authored
Merge branch 'dev15.8' into merges/master-to-dev15.8
2 parents3e59fa0 +224435b commit230ec51

File tree

68 files changed

+1884
-50
lines changed

Some content is hidden

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

68 files changed

+1884
-50
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

‎NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1818
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
19-
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
19+
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2020
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2121
</packageSources>
2222

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0-vs-for-mac-62329-05
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.cmd‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
639639
:: Restore the Tools directory
640640
call%~dp0init-tools.cmd
641641
)
642-
643642
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
644643
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
645644
setNUGET_PACKAGES=%~dp0packages
@@ -666,6 +665,32 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
666665
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
667666
)
668667

668+
echo ----------- Done with package restore, starting dependency uptake check -------------
669+
670+
ifnot"%PB_PackageVersionPropsUrl%"=="" (
671+
setdependencyUptakeDir=%~dp0Tools\dependencyUptake
672+
ifnotexist"!dependencyUptakeDir!"mkdir"!dependencyUptakeDir!"
673+
674+
:: download package version overrides
675+
echo powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
676+
powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
677+
ifERRORLEVEL1echo Error downloading package version properties&&goto :failure
678+
679+
:: prepare dependency uptake files
680+
echo%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
681+
%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
682+
ifERRORLEVEL1echo Error building dependency uptake files&&goto :failure
683+
684+
:: restore dependencies
685+
%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config
686+
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
687+
)
688+
689+
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
690+
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
691+
setNUGET_PACKAGES=%~dp0Packages
692+
setpath=%~dp0Tools\dotnet20\;%path%
693+
669694
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
670695
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
671696
%_ngenexe% install%_fsiexe% /nologo

‎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.8.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 & 5 deletions
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>
@@ -97,16 +97,16 @@
9797
<MicrosoftDiaSymReaderPackageVersion>1.1.0</MicrosoftDiaSymReaderPackageVersion>
9898
<MicrosoftDiaSymReaderPortablePdbPackageVersion>1.2.0</MicrosoftDiaSymReaderPortablePdbPackageVersion>
9999

100-
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
101-
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
102-
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
103-
104100
<!-- Frozen FSharp.Core package being built with this build-->
105101
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
106102
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>
107103
<FSharpCoreLatestTargetPackageVersion>4.3.5</FSharpCoreLatestTargetPackageVersion>
108104
<FSharpCoreLatestTargetMajorVersion>4.3</FSharpCoreLatestTargetMajorVersion>
109105

106+
<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists-->
107+
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
108+
<IntermediateOutputPathCondition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>
109+
110110
<!-- Frozen FSharp.Core package-->
111111
<FSharpCoreFrozenPortablePackageVersion>10.1.0</FSharpCoreFrozenPortablePackageVersion>
112112
<FSharpCoreFrozenPortableTargetPackageVersion>10.2.0</FSharpCoreFrozenPortableTargetPackageVersion>

‎src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
3232
<PropertyGroup>
3333
<EnableDefaultCompileItemsCondition=" '$(EnableDefaultCompileItems)' == ''">false</EnableDefaultCompileItems><!--- Do not glob F# source files-->
3434
<EnableDefaultNoneItemsCondition=" '$(EnableDefaultNoneItems)' == ''">false</EnableDefaultNoneItems>
35+
<DefaultValueTuplePackageVersion>4.3.1</DefaultValueTuplePackageVersion>
36+
<DefaultFSharpPackageVersion>4.3.4</DefaultFSharpPackageVersion>
3537
</PropertyGroup>
3638

3739
<PropertyGroup>
@@ -63,4 +65,15 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
6365
<FscToolPathCondition=" '$(FscToolPath)' == ''">$(MSBuildThisFileDirectory)</FscToolPath>
6466
<FscToolExeCondition="'$(OS)' == 'Unix' and '$(FscToolExe)' == ''">RunFsc.sh</FscToolExe>
6567
</PropertyGroup>
68+
69+
<ItemGroup>
70+
<PackageReferenceInclude="System.ValueTuple"Version="$(DefaultValueTuplePackageVersion)" >
71+
<DefaultInclude>true</DefaultInclude>
72+
</PackageReference>
73+
74+
<PackageReferenceInclude="FSharp.Core"Version="$(DefaultFSharpPackageVersion)">
75+
<DefaultInclude>true</DefaultInclude>
76+
</PackageReference>
77+
</ItemGroup>
78+
6679
</Project>

0 commit comments

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