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

Commit6db8f4f

Browse files
authored
Merge pull request #3996 from KevinRansom/mergemaster
Merge master into dev15.6
2 parents7806527 +f4a95d5 commit6db8f4f

File tree

78 files changed

+1190
-845
lines changed

Some content is hidden

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

78 files changed

+1190
-845
lines changed

‎DEVGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ For **Release**:
192192

193193
####Notes on the Windows .NET Framework build
194194

195-
1. The`update.cmd` scriptadds required strong name validation skips, andNGens the compiler and libraries. This requires admin privileges.
195+
1. The`update.cmd` script NGens the compiler and libraries. This requires admin privileges.
196196
1. The compiler binaries produced are "private" and strong-named signed with a test key.
197197
1. Some additional tools are required to build the compiler, notably`fslex.exe`,`fsyacc.exe`,`FSharp.PowerPack.Build.Tasks.dll`,`FsSrGen.exe`,`FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the`lkg` directory.
198198
1. The overall bootstrapping process executes as follows

‎PublishToBlob.proj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,25 @@
1010
<PropertyGroup>
1111
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
1212
<!-- This version should be kept in sync with `packages.config`-->
13-
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
13+
<FeedTasksPackageVersion>1.0.0-prerelease-02219-01</FeedTasksPackageVersion>
1414
</PropertyGroup>
1515

1616
<ImportProject="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />
1717

1818
<ItemGroup>
19-
<ItemsToPushInclude="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
19+
<NuGetPackagesInclude="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
20+
<OtherAssetsInclude="$(MSBuildThisFileDirectory)insertion\**" />
2021
</ItemGroup>
2122

2223
<TargetName="Build">
2324
<PushToBlobFeedExpectedFeedUrl="$(ExpectedFeedUrl)"
2425
AccountKey="$(AccountKey)"
25-
ItemsToPush="@(ItemsToPush)"
26+
ItemsToPush="@(NuGetPackages)"
27+
Overwrite="$(PublishOverwrite)" />
28+
<PushToBlobFeedExpectedFeedUrl="$(ExpectedFeedUrl)"
29+
AccountKey="$(AccountKey)"
30+
ItemsToPush="@(OtherAssets)"
31+
PublishFlatContainer="true"
2632
Overwrite="$(PublishOverwrite)" />
2733
</Target>
2834

‎build.cmd‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo ^<proto^|protofx^>
2222
echo^<ci^|ci_part1^|ci_part2^|ci_part3^|microbuild^|nuget^>
2323
echo^<debug^|release^>
2424
echo^<diag^|publicsign^>
25-
echo^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
25+
echo^<test^|no-test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-net40-ideunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
2626
echo^<include tag^>
2727
echo^<init^>
2828
echo.
@@ -82,6 +82,7 @@ REM ------------------ Parse all arguments -----------------------
8282

8383
set_autoselect=1
8484
set_autoselect_tests=0
85+
setno_test=0
8586
set /acounter=0
8687
for /l%%xin (11 9)do (
8788
set /acounter=!counter!+1
@@ -296,6 +297,10 @@ if /i "%ARG%" == "test" (
296297
set_autoselect_tests=1
297298
)
298299

300+
if /i"%ARG%"=="no-test" (
301+
setno_test=1
302+
)
303+
299304
if /i"%ARG%"=="include" (
300305
set /acounter=!counter!+1
301306
if"!INCLUDE_TEST_SPEC_NUNIT!"=="" (setINCLUDE_TEST_SPEC_NUNIT=cat ==%ARG2% )else (set INCLUDE_TEST_SPEC_NUNIT=cat==%ARG2% or!INCLUDE_TEST_SPEC_NUNIT! )
@@ -492,8 +497,6 @@ if "%RestorePackages%"=="" (
492497
@echo VSSDKToolsPath:%VSSDKToolsPath%
493498
@echo VSSDKIncludes:%VSSDKIncludes%
494499

495-
@call src\update.cmd signonly
496-
497500
:: Check prerequisites
498501
ifnot"%VisualStudioVersion%"==""goto vsversionset
499502
ifexist"%VS150COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=15.0
@@ -699,21 +702,19 @@ set PATH=%PATH%;%CORDIR%
699702

700703
setREGEXE32BIT=reg.exe
701704

702-
IFNOTDEFINED SNEXE32IFEXIST"%WINSDKNETFXTOOLS%\sn.exe"setSNEXE32=%WINSDKNETFXTOOLS%sn.exe
703-
IFNOTDEFINED SNEXE64IFEXIST"%WINSDKNETFXTOOLS%x64\sn.exe"setSNEXE64=%WINSDKNETFXTOOLS%x64\sn.exe
704705
IFNOTDEFINED ildasmIFEXIST"%WINSDKNETFXTOOLS%\ildasm.exe"setildasm=%WINSDKNETFXTOOLS%ildasm.exe
705706

706707
echo.
707708
echo SDK environment vars
708709
echo =======================
709710
echo WINSDKNETFXTOOLS:%WINSDKNETFXTOOLS%
710-
echo SNEXE32:%SNEXE32%
711-
echo SNEXE64:%SNEXE64%
712711
echo ILDASM:%ILDASM%
713712
echo
714713

715714
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="0"if"%TEST_NET40_COREUNIT_SUITE%"=="0"if"%TEST_CORECLR_COREUNIT_SUITE%"=="0"if"%TEST_VS_IDEUNIT_SUITE%"=="0"if"%TEST_NET40_FSHARP_SUITE%"=="0"if"%TEST_NET40_FSHARPQA_SUITE%"=="0"goto :success
716715

716+
if"%no_test%"=="1"goto :success
717+
717718
echo ---------------- Done with update, starting tests -----------------------
718719

719720
ifNOT"%INCLUDE_TEST_SPEC_NUNIT%"=="" (

‎build.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ build.sh ^<all^|net40^|coreclr^|pcls^|vs^>
2929
^<ci^|ci_part1^|ci_part2^|ci_part3^|microbuild^>
3030
^<debug^|release^>
3131
^<diag^|publicsign^>
32-
^<test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-pcl-coreunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
32+
^<test^|no-test^|test-net40-coreunit^|test-coreclr-coreunit^|test-compiler-unit^|test-pcl-coreunit^|test-net40-fsharp^|test-coreclr-fsharp^|test-net40-fsharpqa^>
3333
^<include tag^>
3434
^<init^>
3535
@@ -104,6 +104,7 @@ export INCLUDE_TEST_TAGS=
104104

105105
# Set up variables used to determine whether we'll automatically select which
106106
# targets to build/run/test. NOTE: These aren't exported, they're only used by this script.
107+
no_test=0
107108
_autoselect=1
108109
_autoselect_tests=0
109110

@@ -250,6 +251,9 @@ do
250251
"test")
251252
_autoselect_tests=1
252253
;;
254+
"no-test")
255+
no_test=1
256+
;;
253257
"include")
254258
failwith"The 'include' option is not (yet) supported by this script."
255259
#export /a counter=!counter!+1
@@ -559,6 +563,11 @@ if [ "$TEST_NET40_COMPILERUNIT_SUITE" = '0' ] && [ "$TEST_PORTABLE_COREUNIT_SUIT
559563
exit 0
560564
fi
561565

566+
if [$no_test-eq 1 ];then
567+
# Successful build; not running tests so exit now.
568+
exit 0
569+
fi
570+
562571
build_status"Done with update, starting tests"
563572

564573
if [-n"$INCLUDE_TEST_SPEC_NUNIT" ];then

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DefineConstants>$(DefineConstants);DOTNETCORE;FX_ATLEAST_45;FX_ATLEAST_PORTABLE;FX_NO_RUNTIMEENVIRONMENT;FX_RESHAPED_REFLECTION;TODO_REWORK_ASSEMBLY_LOAD;</DefineConstants>
55
<NoWarn>$(NoWarn);44;</NoWarn>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
7-
<DelaySign>true</DelaySign>
7+
<PublicSign>true</PublicSign>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
1010
</PropertyGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@
6363
<DefineConstants>$(DefineConstants);NO_LOGGING_GUI</DefineConstants>
6464
<DefineConstants>$(DefineConstants);FX_RESHAPED_MSBUILD</DefineConstants>
6565
<DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
66-
<DefineConstants>$(DefineConstants);STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY</DefineConstants>
6766
<DefineConstants>$(DefineConstants);TODO_REWORK_ASSEMBLY_LOAD</DefineConstants>
6867
<DefineConstants>$(DefineConstants);TODO_REWORK_SERVER</DefineConstants>
6968
<NoWarn>$(NoWarn);44;69;65;54;61;75;62;9;2003;</NoWarn>
7069
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
71-
<DelaySign>true</DelaySign>
70+
<PublicSign>true</PublicSign>
7271
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7372
</PropertyGroup>
7473
<ItemGroup>

‎init-tools.cmd‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ if [%1]==[force] (
2626
ifexist"%PACKAGES_DIR%microsoft.dotnet.buildtools"rmdir /S /Q"%PACKAGES_DIR%microsoft.dotnet.buildtools"
2727
)
2828

29+
set /pDOTNET_TOOLS_VERSION=<"%~dp0DotnetCLIToolsVersion.txt"
30+
ifnotexist"%DOTNET_TOOLS_PATH%\sdk\%DOTNET_TOOLS_VERSION%" (
31+
:: dotnet cli doesn't yet exist, delete the semaphore
32+
del"%BUILD_TOOLS_SEMAPHORE%">NUL2>&1
33+
)
34+
2935
:: If sempahore exists do nothing
3036
ifexist"%BUILD_TOOLS_SEMAPHORE%" (
3137
echo Tools are already initialized.
@@ -44,7 +50,6 @@ if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%"
4450
echo%PROJECT_JSON_CONTENTS%>"%PROJECT_JSON_FILE%"
4551
echo Running%0>"%INIT_TOOLS_LOG%"
4652

47-
set /pDOTNET_TOOLS_VERSION=<"%~dp0DotnetCLIToolsVersion.txt"
4853
ifexist"%DOTNET_TOOLS_PATH%"goto :afterdotnettoolsrestore
4954

5055
echo Installing dotnet OLD VERSION OF THE cli...

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />
1313

1414
<!-- For the internal orchestrated build. This version should be kept in sync with `PublishToBlob.proj`-->
15-
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />
15+
<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02219-01" />
1616

1717
<!-- Actual dependencies of FSharp.Compiler.dll and FSharp.Core.dll-->
1818
<packageid="System.Collections.Immutable"version="1.3.1" />

‎src/FSharpSource.Profiles.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<ProjectToolsVersion="4.0"DefaultTargets="Build"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44

55
<PropertyGroupCondition="'$(TargetDotnetProfile)'=='net40'">
6-
<DefineConstantsCondition="'$(MonoPackaging)' == 'true'">$(DefineConstants);CROSS_PLATFORM_COMPILER</DefineConstants>
76
<DefineConstants>$(DefineConstants);PREFERRED_UI_LANG</DefineConstants>
87
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
98
<DefineConstants>$(DefineConstants);BE_SECURITY_TRANSPARENT</DefineConstants>

‎src/FSharpSource.Settings.targets‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,14 @@
5656
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>
5757
</PropertyGroup>
5858

59-
<PropertyGroupCondition="'$(MonoPackaging)' != 'true' AND '$(OS)' != 'Unix'">
59+
<PropertyGroup>
60+
<SignAssembly>true</SignAssembly>
61+
<AssemblyOriginatorKeyFile>$(FSharpSourcesRoot)\fsharp\msft.pubkey</AssemblyOriginatorKeyFile>
62+
<StrongNames>true</StrongNames>
63+
<PublicSign>true</PublicSign>
64+
</PropertyGroup>
65+
66+
<PropertyGroupCondition="'$(OS)' != 'Unix'">
6067
<UseMicroBuild>true</UseMicroBuild>
6168
<UseSourceLink Condition =" '$(UseSourceLink)' == '' AND '$(Configuration)'=='Release'">false</UseSourceLink>
6269
<UseGatherBinaries>true</UseGatherBinaries>
@@ -139,11 +146,6 @@
139146
<FsLexToolExe>fslex.exe</FsLexToolExe>
140147
<FsYaccToolExe>fsyacc.exe</FsYaccToolExe>
141148

142-
143-
<!-- The version of MSBuild assumed byt the F# compiler in the Mono packaging of F#-->
144-
<MonoPackagingMSBuildVersionSuffix>v12.0</MonoPackagingMSBuildVersionSuffix>
145-
<MonoPackagingMSBuildVersionFull>12.0.0.0</MonoPackagingMSBuildVersionFull>
146-
147149
<!-- FSharp.Compiler.Tools is currently only used to get a working FSI.EXE to execute some scripts during the build-->
148150
<!-- The LKG FSI.EXE requires MSBuild 15 to be installed, which is painful-->
149151
<FsiToolPath>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.1.27\tools</FsiToolPath>

0 commit comments

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