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

Commit4c4073a

Browse files
authored
Merge pull requestdotnet#5011 from Microsoft/merges/master-to-dev15.8
Merge master to dev15.8
2 parents1d06b53 +54cbfd5 commit4c4073a

File tree

42 files changed

+369
-1146
lines changed

Some content is hidden

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

42 files changed

+369
-1146
lines changed

‎build.cmd‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -796,8 +796,8 @@ if "%BUILD_NET40%" == "1" (
796796
echo ---------------- Done with assembly version checks, starting assembly signing ---------------
797797

798798
ifnot"%SIGN_TYPE%"=="" (
799-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
800-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\AssemblySignToolData.json
799+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
800+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\AssemblySignToolData.json
801801
ifERRORLEVEL1echo Error running sign tool&&goto :failure
802802
)
803803

@@ -808,20 +808,8 @@ echo %_msbuildexe% %msbuildflags% build-nuget-packages.proj /p:Configuration=%BU
808808
ifERRORLEVEL1echo Error building NuGet packages&&goto :failure
809809

810810
ifnot"%SIGN_TYPE%"=="" (
811-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
812-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\PackageSignToolData.json
813-
ifERRORLEVEL1echo Error running sign tool&&goto :failure
814-
)
815-
816-
if"%BUILD_SETUP%"=="1" (
817-
echo%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
818-
%_msbuildexe%%msbuildflags% setup\build-msi.proj /p:Configuration=%BUILD_CONFIG%
819-
ifERRORLEVEL1echo Error building MSI&&goto :failure
820-
)
821-
822-
ifnot"%SIGN_TYPE%"=="" (
823-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
824-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\MsiSignToolData.json
811+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
812+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\PackageSignToolData.json
825813
ifERRORLEVEL1echo Error running sign tool&&goto :failure
826814
)
827815

@@ -832,8 +820,8 @@ if "%BUILD_SETUP%" == "1" (
832820
)
833821

834822
ifnot"%SIGN_TYPE%"=="" (
835-
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
836-
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -ConfigFile build\config\InsertionSignToolData.json
823+
echo build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
824+
call build\scripts\run-signtool.cmd -MSBuild%_msbuildexe% -SignType%SIGN_TYPE% -Configuration%BUILD_CONFIG% -ConfigFile build\config\InsertionSignToolData.json
837825
ifERRORLEVEL1echo Error running sign tool&&goto :failure
838826
)
839827

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
{
2-
"sign": [
3-
{
4-
"certificate":"VsixSHA2",
5-
"strongName":null,
6-
"values": [
7-
"insertion\\Microsoft.FSharp.SDK.Resources.ENU.vsix"
8-
]
9-
}
10-
],
11-
"exclude": [
12-
]
13-
}
14-
2+
"sign": [
3+
{
4+
"certificate":"VsixSHA2",
5+
"strongName":null,
6+
"values": [
7+
"insertion\\Microsoft.FSharp.Compiler.vsix",
8+
"insertion\\Microsoft.FSharp.Compiler.Resources.*.vsix",
9+
"insertion\\Microsoft.FSharp.SDK.vsix"
10+
]
11+
}
12+
],
13+
"exclude": [
14+
"fsc.exe",
15+
"FSharp.Build.dll",
16+
"FSharp.Build.resources.dll",
17+
"FSharp.Core.dll",
18+
"FSharp.Core.resources.dll",
19+
"FSharp.Compiler.Private.dll",
20+
"FSharp.Compiler.Private.resources.dll",
21+
"FSharp.Compiler.Server.Shared.dll",
22+
"FSharp.Compiler.Interactive.Settings.dll",
23+
"FSharp.Compiler.Interactive.Settings.resources.dll",
24+
"fsi.exe",
25+
"fsiAnyCpu.exe",
26+
"FSharp.Data.TypeProviders.dll",
27+
"Microsoft.Build.dll",
28+
"Microsoft.Build.Conversion.Core.dll",
29+
"Microsoft.Build.Engine.dll",
30+
"Microsoft.Build.Framework.dll",
31+
"Microsoft.Build.Tasks.Core.dll",
32+
"Microsoft.Build.Utilities.Core.dll",
33+
"System.Collections.Immutable.dll",
34+
"System.Reflection.Metadata.dll",
35+
"System.ValueTuple.dll"
36+
]
37+
}

‎build/config/MsiSignToolData.json‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎build/scripts/run-signtool.cmd‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ if /i "%arg%" == "-SignType" (
2626
setSignType=%argv%
2727
shift
2828
)
29+
if /i"%arg%"=="-Configuration" (
30+
setConfiguration=%argv%
31+
shift
32+
)
2933
if /i"%arg%"=="-ConfigFile" (
3034
setConfigFile=%argv%
3135
shift
@@ -50,7 +54,7 @@ set SignToolArgs=%SignToolArgs% -test
5054
:runsigntool
5155

5256
ifnotexist"%_signtoolexe%"echo The signing tool could not be found at location '%_signtoolexe%'&&goto error
53-
setSignToolArgs=%SignToolArgs%"%scriptdir%..\..\release"
57+
setSignToolArgs=%SignToolArgs%"%scriptdir%..\..\%Configuration%"
5458
echo"%_signtoolexe%"%SignToolArgs%
5559
"%_signtoolexe%"%SignToolArgs%
5660
iferrorlevel1goto error

‎build/targets/GenerateAssemblyAttributes.targets‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
<ImportProject="GitHash.props" />
44

5+
<TargetName="GenerateAssemblyLevelAttributes"
6+
BeforeTargets="CoreCompile">
7+
8+
<PropertyGroup>
9+
<GeneratedFSharpAssemblyLevelAttributesFile>$(IntermediateOutputPath)$(MSBuildProjectName).AssemblyLevelAttributes$(DefaultLanguageSourceExtension)</GeneratedFSharpAssemblyLevelAttributesFile>
10+
</PropertyGroup>
11+
12+
<WriteCodeFragmentAssemblyAttributes="@(AssemblyLevelAttribute)"
13+
Language="$(Language)"
14+
OutputFile="$(GeneratedFSharpAssemblyLevelAttributesFile)"
15+
Condition="'@(AssemblyLevelAttribute)' != ''">
16+
<OutputTaskParameter="OutputFile"ItemName="Compile"Condition="'$(Language)' != 'F#'" />
17+
<OutputTaskParameter="OutputFile"ItemName="CompileBefore"Condition="'$(Language)' == 'F#'" />
18+
<OutputTaskParameter="OutputFile"ItemName="FileWrites" />
19+
</WriteCodeFragment>
20+
21+
</Target>
22+
523
<TargetName="GenerateAssemblyFileVersion"
624
BeforeTargets="CoreCompile"
725
Condition="'$(Configuration)' != 'Proto'">
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
net4*/
2+
netstandard*/

‎setup/FSharp.SDK/Common.Wix.Properties.wxs‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

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