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

Commit0adb823

Browse files
authored
Merge pull requestdotnet#4425 from Microsoft/merges/dev15.6-to-master
merge dev15.6 to master
2 parentsf214dcc +0dbb19b commit0adb823

File tree

191 files changed

+1372
-605
lines changed

Some content is hidden

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

191 files changed

+1372
-605
lines changed

‎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/api/v3/index.json" />
19+
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn-for-vs-for-mac/api/v3/index.json" />
2020
</packageSources>
2121

2222
</configuration>

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.0-beta2-61719-01
1+
2.6.0-vs-for-mac-62329-05

‎build-everything.proj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj" />
2525
<ProjectsWithCoreClrInclude="src/fsharp/Fsc/Fsc.fsproj" />
2626
<ProjectsWithCoreClrInclude="src/fsharp/fsi/Fsi.fsproj" />
27-
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj" />
28-
</ItemGroup>
27+
<ProjectsWithCoreClrInclude="src/fsharp/FSharp.Compiler.nuget/Testing.FSharp.Compiler.nuget.proj" />
28+
</ItemGroup>
2929

3030
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3131
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
@@ -58,10 +58,6 @@
5858
<SetupProjectsInclude="setup/fsharp-setup-build.proj" />
5959
</ItemGroup>
6060

61-
<ItemGroupCondition="'$(BUILD_NUGET)'=='1'">
62-
<NugetProjectsInclude="src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.proj" />
63-
</ItemGroup>
64-
6561
<!-- +++++++++++++++++++++++ Project selection for testing +++++++++++++++++++++++++++++++-->
6662

6763
<ItemGroupCondition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >

‎build-nuget-packages.proj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
2+
<Projectxmlns="http://schemas.microsoft.com/developer/msbuild/2003"ToolsVersion="4.0">
3+
4+
<ItemGroup>
5+
<PackageProjectsInclude="src\fsharp\FSharp.Compiler.nuget\Microsoft.FSharp.Compiler.nuget.proj"Condition="'$(BUILD_CORECLR)'=='1'" />
6+
<PackageProjectsInclude="src\fsharp\FSharp.Core.nuget\FSharp.Core.nuget.proj"Condition="'$(BUILD_NUGET)'=='1'" />
7+
</ItemGroup>
8+
9+
<TargetName="Build">
10+
<MSBuildProjects="@(PackageProjects)"Targets="Build"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
11+
</Target>
12+
13+
<TargetName="Rebuild">
14+
<MSBuildProjects="@(PackageProjects)"Targets="Rebuild"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
15+
</Target>
16+
17+
<TargetName="Clean">
18+
<MSBuildProjects="@(PackageProjects)"Targets="Clean"BuildInParallel="true"Properties="Configuration=$(Configuration)" />
19+
</Target>
20+
21+
</Project>

‎build.cmd‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
650650
:: Restore the Tools directory
651651
call%~dp0init-tools.cmd
652652
)
653+
653654
set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
654655
set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
655656
setNUGET_PACKAGES=%~dp0Packages
@@ -661,7 +662,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
661662
%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%
662663
)
663664

664-
665665
echo ----------- Done with package restore, starting dependency uptake check -------------
666666

667667
ifnot"%PB_PackageVersionPropsUrl%"=="" (
@@ -685,10 +685,10 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
685685

686686
set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"
687687
ifnotexist%_fsiexe%echo Error: Could not find%_fsiexe%&&goto :failure
688-
%_ngenexe% install%_fsiexe% /nologo
688+
%_ngenexe% install%_fsiexe% /nologo
689689

690690
ifnotexist%_nugetexe%echo Error: Could not find%_nugetexe%&&goto :failure
691-
%_ngenexe% install%_nugetexe% /nologo
691+
%_ngenexe% install%_nugetexe% /nologo
692692

693693
echo ---------------- Done with package restore, verify buildfrom source ---------------
694694
if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (
@@ -739,14 +739,27 @@ if "%BUILD_PHASE%" == "1" (
739739
@if ERRORLEVEL1echo Error build failed&&goto :failure
740740
)
741741

742-
echo ---------------- Done with build, starting assembly signing ---------------
742+
echo ---------------- Done with build, starting assembly version checks ---------------
743+
setasmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
744+
745+
echo"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
746+
"%~dp0%BUILD_CONFIG%\net40\bin\fsi.exe"%asmvercheckpath%\AssemblyVersionCheck.fsx --"%~dp0build\config\AssemblySignToolData.json""%~dp0%BUILD_CONFIG%"
747+
ifERRORLEVEL1echo Error verifying assembly versions and commit hashes.&&goto :failure
748+
749+
echo ---------------- Done with assembly version checks, starting assembly signing ---------------
743750

744751
ifnot"%SIGN_TYPE%"=="" (
745752
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
746753
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
747754
ifERRORLEVEL1echo Error running sign tool&&goto :failure
748755
)
749756

757+
echo ---------------- Done with assembly signing, start package creation ---------------
758+
759+
echo%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
760+
%_msbuildexe%%msbuildflags% build-nuget-packages.proj /p:Configuration=%BUILD_CONFIG%
761+
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
762+
750763
if"%BUILD_SETUP%"=="1" (
751764
echo%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
752765
%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%

‎build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/sh
22

33
make Configuration=release
4-

‎build/config/AssemblySignToolData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"Microsoft.DiaSymReader.dll",
6767
"Microsoft.DiaSymReader.PortablePdb.dll",
6868
"Newtonsoft.Json.dll",
69-
"System.ValueTuple.4.3.1.nupkg",
69+
"System.ValueTuple.4.4.0.nupkg",
7070
"System.Collections.Immutable.dll",
7171
"System.Reflection.Metadata.dll",
7272
"System.ValueTuple.dll"
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<Project>
2+
3+
<ImportProject="GitHash.props" />
4+
5+
<PropertyGroup>
6+
<GeneratedFSharpInternalsVisibleToFile>$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedFSharpInternalsVisibleToFile>
7+
</PropertyGroup>
8+
9+
<ItemDefinitionGroup>
10+
<InternalsVisibleTo>
11+
<Visible>false</Visible>
12+
</InternalsVisibleTo>
13+
</ItemDefinitionGroup>
14+
15+
<TargetName="PrepareFSharpGenerateInternalsVisibleToFile"
16+
Condition="'@(InternalsVisibleTo)' != ''">
17+
<PropertyGroup>
18+
<_PublicKey>002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293</_PublicKey>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<_InternalsVisibleToAttributeInclude="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
22+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' != ''">%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.Key)</_Parameter1>
23+
<_Parameter1Condition="'%(InternalsVisibleTo.Key)' == ''">%(InternalsVisibleTo.Identity), PublicKey=$(_PublicKey)</_Parameter1>
24+
</_InternalsVisibleToAttribute>
25+
</ItemGroup>
26+
</Target>
27+
28+
<TargetName="GenerateFSharpInternalsVisibleToFile"
29+
Inputs="$(MSBuildProjectFile)"
30+
Outputs="$(GeneratedFSharpInternalsVisibleToFile)"
31+
DependsOnTargets="PrepareFSharpGenerateInternalsVisibleToFile;PrepareForBuild"
32+
Condition="'$(Configuration)' != 'Proto' and '@(InternalsVisibleTo)' != ''"
33+
BeforeTargets="CoreCompile">
34+
<WriteCodeFragmentAssemblyAttributes="@(_InternalsVisibleToAttribute)"
35+
Language="$(Language)"
36+
OutputFile="$(GeneratedFSharpInternalsVisibleToFile)">
37+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore" />
38+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
39+
</WriteCodeFragment>
40+
</Target>
41+
42+
<TargetName="GenerateAssemblyFileVersion"
43+
BeforeTargets="CoreCompile"
44+
Condition="'$(Configuration)' != 'Proto'">
45+
<PropertyGroup>
46+
<GeneratedFSharpAssemblyVersionFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyAttributes$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyVersionFile>
47+
<!-- AssemblyInformationalVersionAttribute issues a by-design warning if the value passed isn't of the form #.#.#.#, but we specifically want to suppress this to allow the commit hash to be embedded.-->
48+
<NoWarnCondition="'$(Language)' == 'F#'">2003;$(NoWarn)</NoWarn>
49+
</PropertyGroup>
50+
51+
<ItemGroup>
52+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyCompanyAttribute">
53+
<_Parameter1>Microsoft Corporation</_Parameter1>
54+
</_AssemblyVersionAttributes>
55+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyCopyrightAttribute">
56+
<_Parameter1>&#169; Microsoft Corporation. All Rights Reserved.</_Parameter1>
57+
</_AssemblyVersionAttributes>
58+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyDescriptionAttribute">
59+
<_Parameter1>$(AssemblyName).dll</_Parameter1>
60+
</_AssemblyVersionAttributes>
61+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyFileVersionAttribute">
62+
<_Parameter1>$(Build_FileVersion)</_Parameter1>
63+
</_AssemblyVersionAttributes>
64+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyInformationalVersionAttribute">
65+
<_Parameter1>$(MicroBuildAssemblyVersion). Commit Hash: $(GitHeadSha).</_Parameter1>
66+
</_AssemblyVersionAttributes>
67+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyProductAttribute">
68+
<_Parameter1>Microsoft&#174; F#</_Parameter1>
69+
</_AssemblyVersionAttributes>
70+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyTitleAttribute">
71+
<_Parameter1>$(AssemblyName).dll</_Parameter1>
72+
</_AssemblyVersionAttributes>
73+
<_AssemblyVersionAttributesInclude="System.Reflection.AssemblyVersionAttribute">
74+
<_Parameter1>$(MicroBuildAssemblyVersion)</_Parameter1>
75+
</_AssemblyVersionAttributes>
76+
</ItemGroup>
77+
78+
<WriteCodeFragmentAssemblyAttributes="@(_AssemblyVersionAttributes)"
79+
Language="$(Language)"
80+
OutputFile="$(GeneratedFSharpAssemblyVersionFile)">
81+
<!-- For FSharp.Core, assembly version must be inserted after all Core files, as it defines F# basic types (strings)-->
82+
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(AssemblyName)' == 'FSharp.Core' or '$(Language)' != 'F#'" />
83+
<!-- For other assemblies, this must be inserted before all source files, to keep exe's EntryPoints (if any) as the last source file-->
84+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(Language)' == 'F#'" />
85+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
86+
</WriteCodeFragment>
87+
</Target>
88+
89+
</Project>

‎build/targets/AssemblyVersions.props‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,17 @@
1919
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2020
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2121

22-
<FSCoreVersion>4.4.1.0</FSCoreVersion>
22+
<FSCoreVersion>4.4.3.0</FSCoreVersion>
23+
<FSProductVersion>10.1.1.0</FSProductVersion>
24+
<FSPackageVersion>10.1.4</FSPackageVersion>
25+
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>
2326
<MicroBuildAssemblyVersionCondition="'$(MicroBuildAssemblyVersion)' == ''">$(FSCoreVersion)</MicroBuildAssemblyVersion>
24-
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">15.4.1.0</MicroBuildAssemblyVersion>
27+
28+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
29+
<MicroBuildAssemblyVersionCondition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</MicroBuildAssemblyVersion>
30+
31+
<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion-->
32+
<MicroBuildAssemblyVersionCondition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</MicroBuildAssemblyVersion>
2533

2634
<!--
2735

‎build/targets/PackageVersions.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<!-- Roslyn packages-->
1212
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
1313
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
14+
<MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
1415
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
1516
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
1617

0 commit comments

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