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

Commit09648d4

Browse files
authored
Merge pull requestdotnet#4616 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parents1214430 +a933b46 commit09648d4

File tree

152 files changed

+4486
-3462
lines changed

Some content is hidden

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

152 files changed

+4486
-3462
lines changed

‎VisualFSharp.sln‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Build.UnitTests", "t
138138
EndProject
139139
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PEVerify","tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj","{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
140140
EndProject
141+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PatternMatcher","vsintegration\src\PatternMatcher\PatternMatcher.csproj","{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
142+
EndProject
141143
Global
142144
GlobalSection(SolutionConfigurationPlatforms) =preSolution
143145
Debug|Any CPU=Debug|Any CPU
@@ -554,6 +556,14 @@ Global
554556
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.Build.0=Release|Any CPU
555557
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.ActiveCfg=Release|Any CPU
556558
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.Build.0=Release|Any CPU
559+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
560+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|Any CPU.Build.0=Debug|Any CPU
561+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.ActiveCfg=Debug|Any CPU
562+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Debug|x86.Build.0=Debug|Any CPU
563+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.ActiveCfg=Release|Any CPU
564+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.Build.0=Release|Any CPU
565+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.ActiveCfg=Release|Any CPU
566+
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.Build.0=Release|Any CPU
557567
EndGlobalSection
558568
GlobalSection(SolutionProperties) =preSolution
559569
HideSolutionNode =FALSE
@@ -617,6 +627,7 @@ Global
617627
{0385564F-07B4-4264-AB8A-17C393E9140C} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
618628
{400FAB03-786E-40CC-85A8-04B0C2869B14} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
619629
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
630+
{18227628-DF90-4C47-AF3D-CC72D2EDD986} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
620631
EndGlobalSection
621632
GlobalSection(ExtensibilityGlobals) =postSolution
622633
SolutionGuid ={48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

‎build-everything.proj‎

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

6262
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
6363

64-
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
64+
<ItemGroupCondition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
6565
<ProjectsWithNet40Include="tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj"/>
6666
<ProjectsWithNet40Include="tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
6767
</ItemGroup>

‎build.cmd‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ if /i "%ARG%" == "microbuild" (
211211
setBUILD_VS=1
212212
setBUILD_SETUP=%FSC_BUILD_SETUP%
213213
setBUILD_NUGET=1
214+
setBUILD_MICROBUILD=1
214215

215216
setTEST_NET40_COMPILERUNIT_SUITE=1
216217
setTEST_NET40_COREUNIT_SUITE=1
@@ -478,6 +479,7 @@ echo BUILD_SETUP=%BUILD_SETUP%
478479
echo BUILD_NUGET=%BUILD_NUGET%
479480
echo BUILD_CONFIG=%BUILD_CONFIG%
480481
echo BUILD_PUBLICSIGN=%BUILD_PUBLICSIGN%
482+
echo BUILD_MICROBUILD=%BUILD_MICROBUILD%
481483
echo.
482484
echo PB_SKIPTESTS=%PB_SKIPTESTS%
483485
echo PB_RESTORESOURCE=%PB_RESTORESOURCE%
@@ -864,7 +866,7 @@ echo SNEXE32: %SNEXE32%
864866
echo SNEXE64:%SNEXE64%
865867
echo
866868

867-
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="0"if"%TEST_FCS%"=="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
869+
if"%TEST_NET40_COMPILERUNIT_SUITE%"=="0"if"%TEST_FCS%"=="0"if"%TEST_NET40_COREUNIT_SUITE%"=="0"if"TEST_CORECLR_FSHARP_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
868870

869871
if"%no_test%"=="1"goto :success
870872

@@ -1019,38 +1021,49 @@ if "%TEST_NET40_COMPILERUNIT_SUITE%" == "1" (
10191021
echo -----------------------------------------------------------------
10201022
goto :failure
10211023
)
1022-
)
1023-
1024-
REM ---------------- net40-coreunit -----------------------
1025-
1026-
if"%TEST_NET40_COREUNIT_SUITE%"=="1" (
10271024

10281025
setOUTPUTARG=
10291026
setERRORARG=
10301027
setOUTPUTFILE=
10311028
setERRORFILE=
1032-
setXMLFILE=!RESULTSDIR!\test-net40-coreunit-results.xml
1029+
setXMLFILE=!RESULTSDIR!\test-net40-buildunit-results.xml
10331030
if"%CI%"=="1" (
1034-
setERRORFILE=!RESULTSDIR!\test-net40-coreunit-errors.log
1035-
setOUTPUTFILE=!RESULTSDIR!\test-net40-coreunit-output.log
1031+
setOUTPUTFILE=!RESULTSDIR!\test-net40-buildunit-output.log
1032+
setERRORFILE=!RESULTSDIR!\test-net40-buildunit-errors.log
10361033
setERRORARG=--err:"!ERRORFILE!"
10371034
setOUTPUTARG=--output:"!OUTPUTFILE!"
10381035
)
1039-
1036+
setERRORFILE=!RESULTSDIR!\test-net40-buildunit-errors.log
10401037
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10411038
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Build.UnitTests.dll"!WHERE_ARG_NUNIT!
10421039

1043-
10441040
iferrorlevel1 (
10451041
echo -----------------------------------------------------------------
10461042
type"!OUTPUTFILE!"
10471043
echo -----------------------------------------------------------------
10481044
type"!ERRORFILE!"
10491045
echo -----------------------------------------------------------------
1050-
echo Error: Running tests net40-coreunit failed, see logs above -- FAILED
1046+
echo Error: Running tests net40-compilernit failed, see logs above -- FAILED
10511047
echo -----------------------------------------------------------------
10521048
goto :failure
10531049
)
1050+
)
1051+
1052+
REM ---------------- net40-coreunit -----------------------
1053+
1054+
if"%TEST_NET40_COREUNIT_SUITE%"=="1" (
1055+
1056+
setOUTPUTARG=
1057+
setERRORARG=
1058+
setOUTPUTFILE=
1059+
setERRORFILE=
1060+
setXMLFILE=!RESULTSDIR!\test-net40-coreunit-results.xml
1061+
if"%CI%"=="1" (
1062+
setERRORFILE=!RESULTSDIR!\test-net40-coreunit-errors.log
1063+
setOUTPUTFILE=!RESULTSDIR!\test-net40-coreunit-output.log
1064+
setERRORARG=--err:"!ERRORFILE!"
1065+
setOUTPUTARG=--output:"!OUTPUTFILE!"
1066+
)
10541067

10551068
echo"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!
10561069
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3"!OUTPUTARG!!ERRORARG! --work:"!FSCBINPATH!""!FSCBINPATH!\FSharp.Core.UnitTests.dll"!WHERE_ARG_NUNIT!

‎build/config/AssemblySignToolData.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"net40\\bin\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
3333
"net40\\bin\\FSharp.ProjectSystem.FSharp.dll",
3434
"net40\\bin\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
35+
"net40\\bin\\PatternMatcher.dll",
3536
"coreclr\\bin\\FSharp.Core.dll",
3637
"coreclr\\bin\\*\\FSharp.Core.resources.dll",
3738
"coreclr\\bin\\FSharp.Build.dll",
@@ -65,9 +66,10 @@
6566
"Microsoft.DiaSymReader.dll",
6667
"Microsoft.DiaSymReader.PortablePdb.dll",
6768
"Newtonsoft.Json.dll",
68-
"System.ValueTuple.4.4.0.nupkg",
6969
"System.Collections.Immutable.dll",
7070
"System.Reflection.Metadata.dll",
71+
"System.ValueTuple.4.3.1.nupkg",
72+
"System.ValueTuple.4.4.0.nupkg",
7173
"System.ValueTuple.dll"
7274
]
7375
}

‎fcs/build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let isMono = false
2424
// Utilities
2525
// --------------------------------------------------------------------------------------
2626

27-
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.4"
27+
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.100"
2828

2929
letrunDotnet workingDir args=
3030
letresult=

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="Microsoft.DiaSymReader.PortablePdb"version="1.2.0" />
2121
<packageid="Microsoft.DiaSymReader"version="1.1.0" />
22+
<packageid="System.ValueTuple"version="4.3.1" />
2223
<packageid="System.ValueTuple"version="4.4.0" />
2324
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2425
<packageid="Microsoft.Build"version="14.3.0" />

0 commit comments

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