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

Commit46b758f

Browse files
authored
Merge pull request #5508 from Microsoft/merges/dev15.8-to-master
merge dev15.8 to master
2 parentsbffb2ab +4e96708 commit46b758f

File tree

177 files changed

+2900
-726
lines changed

Some content is hidden

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

177 files changed

+2900
-726
lines changed

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<addkey="myget.org dotnet-buildtools"value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
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" />
18-
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1918
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2019
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2120
</packageSources>

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.0
1+
2.9.0-beta8-63208-01

‎build.cmd‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
680680
:: Restore the Tools directory
681681
call"%~dp0init-tools.cmd"
682682
)
683-
684683
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
685684
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
686685
setNUGET_PACKAGES=%~dp0packages
@@ -710,6 +709,32 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
710709
setDotNetPackageVersionPropsPath=!dependencyUptakeDir!\PackageVersions.props
711710
)
712711

712+
echo ----------- Done with package restore, starting dependency uptake check -------------
713+
714+
ifnot"%PB_PackageVersionPropsUrl%"=="" (
715+
setdependencyUptakeDir=%~dp0Tools\dependencyUptake
716+
ifnotexist"!dependencyUptakeDir!"mkdir"!dependencyUptakeDir!"
717+
718+
:: download package version overrides
719+
echo powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
720+
powershell -noprofile -executionPolicy RemoteSigned -command"Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'"
721+
ifERRORLEVEL1echo Error downloading package version properties&&goto :failure
722+
723+
:: prepare dependency uptake files
724+
echo%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
725+
%_msbuildexe%%msbuildflags%%~dp0build\projects\PrepareDependencyUptake.proj /t:Build
726+
ifERRORLEVEL1echo Error building dependency uptake files&&goto :failure
727+
728+
:: restore dependencies
729+
%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config
730+
ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure
731+
)
732+
733+
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
734+
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
735+
setNUGET_PACKAGES=%~dp0Packages
736+
setpath=%~dp0Tools\dotnet20\;%path%
737+
713738
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
714739
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
715740
%_ngenexe% install%_fsiexe% /nologo
@@ -766,8 +791,8 @@ echo ---------------- Done with SDK restore, starting build --------------------
766791

767792
if"%BUILD_PHASE%"=="1" (
768793

769-
echo%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
770-
%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG%
794+
echo%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.restore.%BUILD_CONFIG%.binlog
795+
%_msbuildexe%%msbuildflags% build-everything.proj /t:Restore%BUILD_DIAG% /bl:%~dp0%BUILD_CONFIG%\net40\binmsbuild.build-everything.restore.%BUILD_CONFIG%.binlog
771796

772797
echo%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-everything.build.%BUILD_CONFIG%.binlog
773798
%_msbuildexe%%msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%%BUILD_DIAG% /p:BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN% /bl:%~dp0%BUILD_CONFIG%\logs\msbuild.build-everything.build.%BUILD_CONFIG%.binlog

‎build/config/AssemblySignToolData.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@
5757
}
5858
],
5959
"exclude": [
60+
"e_sqlite3.dll",
61+
"FSharp.Core.4.5.2.nupkg",
6062
"FSharp.Data.TypeProviders.dll",
6163
"Microsoft.Build.dll",
6264
"Microsoft.Build.Framework.dll",

‎build/targets/AssemblyVersions.props‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@
2121
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2222
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2323

24-
<FSCoreVersion>4.4.3.0</FSCoreVersion>
25-
<FSProductVersion>10.1.1.0</FSProductVersion>
26-
<FSPackageVersion>10.1.4</FSPackageVersion>
24+
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
25+
<FSCorePackageVersion>$(FSCoreMajorVersion).3</FSCorePackageVersion>
26+
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
27+
28+
<FSPackageMajorVersion>10.2</FSPackageMajorVersion>
29+
<FSPackageVersion>$(FSPackageMajorVersion).3</FSPackageVersion>
30+
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
2731

2832
<VSMajorVersion>15</VSMajorVersion>
29-
<VSMinorVersion>7</VSMinorVersion>
33+
<VSMinorVersion>8</VSMinorVersion>
3034
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3135
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>
3236

‎build/targets/PackageVersions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
77

88
<!-- System.* packages-->
9-
<SystemCollectionsImmutablePackageVersion>1.4.0</SystemCollectionsImmutablePackageVersion>
9+
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
1010
<SystemIoCompressionPackageVersion>4.3.0</SystemIoCompressionPackageVersion>
1111
<SystemRuntimeCachingPackageVersion>1.5.0</SystemRuntimeCachingPackageVersion>
12-
<SystemReflectionMetadataPackageVersion>1.5.0</SystemReflectionMetadataPackageVersion>
12+
<SystemReflectionMetadataPackageVersion>1.6.0</SystemReflectionMetadataPackageVersion>
1313
<SystemValueTuplePackageVersion>4.3.0</SystemValueTuplePackageVersion>
1414

1515
<!-- Roslyn packages-->

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
@@ -28,7 +29,7 @@
2829
<ItemGroup>
2930
<ReferenceInclude="System.Runtime" />
3031
<ReferenceInclude="System.IO" />
31-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
32+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3233
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3334
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3435
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net45</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<OutputPath>..\..\$(Configuration.ToLower())\fcs</OutputPath>
1011
</PropertyGroup>
1112
<PropertyGroup>
@@ -30,7 +31,7 @@
3031
<ItemGroup>
3132
<ReferenceInclude="System.Runtime" />
3233
<ReferenceInclude="System.IO" />
33-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
34+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3435
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
3536
</ItemGroup>
3637
</Project>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyGroup>
88
<OutputType>Exe</OutputType>
99
<TargetFrameworks>net45</TargetFrameworks>
10+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1011
<DefineConstants>$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
1112
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
1213
<OtherFlags>$(OtherFlags) --staticlink:FSharp.Core</OtherFlags>
@@ -27,7 +28,7 @@
2728
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2829
<Private>false</Private>
2930
</Reference>
30-
<PackageReferenceInclude="FSharp.Core"Version="4.1.*" />
31+
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3132
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3233
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3334
<Private>false</Private>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<ImportProject="..\netfx.props" />
77
<PropertyGroup>
88
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
9+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
910
<NoWarn>$(NoWarn);44;75;</NoWarn>
1011
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1112
<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -71,7 +72,7 @@
7172
<NoneInclude="App.config" />
7273
</ItemGroup>
7374
<ItemGroup>
74-
<PackageReferenceInclude="FSharp.Core"Version="4.2.*" />
75+
<PackageReferenceInclude="FSharp.Core"Version="4.2.3" />
7576
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="15.6.0" />
7677
<PackageReferenceInclude="NUnit"Version="3.9.0" />
7778
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.9.0" />

0 commit comments

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