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

Commitc6250eb

Browse files
authored
[WIP] Fix signing (dotnet#6046)
* fix assembly path for signing* don't unconditionally deploy the templates VSIX on build* ensure insertion manifest is written to the correct location* correct package version
1 parent0302e63 commitc6250eb

File tree

5 files changed

+40
-40
lines changed

5 files changed

+40
-40
lines changed

‎build.cmd‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,8 +681,8 @@ set asmvercheckpath=%~dp0tests\fsharpqa\testenv\src\AssemblyVersionCheck
681681

682682
if"%BUILD_NET40%"=="1" (
683683
echo #r @"%USERPROFILE%\.nuget\packages\Newtonsoft.Json\9.0.1\lib\net45\Newtonsoft.Json.dll">%asmvercheckpath%\assemblies.fsx
684-
echo"%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0artifacts\bin"
685-
"%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0artifacts\bin"
684+
echo"%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0artifacts"
685+
"%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46\fsi.exe""%asmvercheckpath%\AssemblyVersionCheck.fsx" --"%~dp0build\config\AssemblySignToolData.json""%~dp0artifacts"
686686
ifERRORLEVEL1echo Error verifying assembly versions and commit hashes.&&goto :failure
687687
)
688688

@@ -692,8 +692,8 @@ if not "%SIGN_TYPE%" == "" (
692692
echo%_msbuildexe% build\projects\Signing.proj /t:Restore
693693
%_msbuildexe% build\projects\Signing.proj /t:Restore
694694

695-
echo%_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
696-
%_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts\bin /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
695+
echo%_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
696+
%_msbuildexe% build\projects\Signing.proj /t:DoSigning /p:SignType=%SIGN_TYPE% /p:Configuration=%BUILD_CONFIG% /p:BinaryBasePath=%~dp0artifacts /p:ConfigFile=%~dp0build\config\AssemblySignToolData.json
697697

698698
ifERRORLEVEL1echo Error running sign tool&&goto :failure
699699
)

‎build/config/AssemblySignToolData.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,45 @@
44
"certificate":"Microsoft",
55
"strongName":"StrongName",
66
"values": [
7-
"FSharp.Core\\*\\*\\FSharp.Core.dll",
8-
"FSharp.Core\\*\\*\\*\\FSharp.Core.resources.dll",
9-
"FSharp.Build\\*\\*\\FSharp.Build.dll",
10-
"FSharp.Build\\*\\*\\*\\FSharp.Build.resources.dll",
11-
"FSharp.Compiler.Private\\*\\*\\FSharp.Compiler.Private.dll",
12-
"FSharp.Compiler.Private\\*\\*\\*\\FSharp.Compiler.Private.resources.dll",
13-
"FSharp.Compiler.Server.Shared\\*\\*\\FSharp.Compiler.Server.Shared.dll",
14-
"FSharp.Compiler.Interactive.Settings\\*\\*\\FSharp.Compiler.Interactive.Settings.dll",
15-
"FSharp.Compiler.Interactive.Settings\\*\\*\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
16-
"fsc\\*\\*\\fsc.exe",
17-
"fsi\\*\\*\\fsi.exe",
18-
"fsiAnyCpu\\*\\*\\fsiAnyCpu.exe",
19-
"FSharp.VS.FSI\\*\\*\\FSharp.VS.FSI.dll",
20-
"FSharp.VS.FSI\\*\\*\\*\\FSharp.VS.FSI.resources.dll",
21-
"FSharp.LanguageService.Base\\*\\*\\FSharp.LanguageService.Base.dll",
22-
"FSharp.LanguageService.Base\\*\\*\\*\\FSharp.LanguageService.Base.resources.dll",
23-
"FSharp.LanguageService\\*\\*\\FSharp.LanguageService.dll",
24-
"FSharp.LanguageService\\*\\*\\*\\FSharp.LanguageService.resources.dll",
25-
"FSharp.UIResources\\*\\*\\FSharp.UIResources.dll",
26-
"FSharp.UIResources\\*\\*\\*\\FSharp.UIResources.resources.dll",
27-
"FSharp.Editor\\*\\*\\FSharp.Editor.dll",
28-
"FSharp.Editor\\*\\*\\*\\FSharp.Editor.resources.dll",
29-
"FSharp.ProjectSystem.Base\\*\\*\\FSharp.ProjectSystem.Base.dll",
30-
"FSharp.ProjectSystem.Base\\*\\*\\*\\FSharp.ProjectSystem.Base.resources.dll",
31-
"FSharp.ProjectSystem.PropertyPages\\*\\*\\FSharp.ProjectSystem.PropertyPages.dll",
32-
"FSharp.ProjectSystem.PropertyPages\\*\\*\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
33-
"FSharp.ProjectSystem.FSharp\\*\\*\\FSharp.ProjectSystem.FSharp.dll",
34-
"FSharp.ProjectSystem.FSharp\\*\\*\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
35-
"FSharp.PatternMatcher\\*\\*\\FSharp.PatternMatcher.dll"
7+
"bin\\FSharp.Core\\*\\*\\FSharp.Core.dll",
8+
"bin\\FSharp.Core\\*\\*\\*\\FSharp.Core.resources.dll",
9+
"bin\\FSharp.Build\\*\\*\\FSharp.Build.dll",
10+
"bin\\FSharp.Build\\*\\*\\*\\FSharp.Build.resources.dll",
11+
"bin\\FSharp.Compiler.Private\\*\\*\\FSharp.Compiler.Private.dll",
12+
"bin\\FSharp.Compiler.Private\\*\\*\\*\\FSharp.Compiler.Private.resources.dll",
13+
"bin\\FSharp.Compiler.Server.Shared\\*\\*\\FSharp.Compiler.Server.Shared.dll",
14+
"bin\\FSharp.Compiler.Interactive.Settings\\*\\*\\FSharp.Compiler.Interactive.Settings.dll",
15+
"bin\\FSharp.Compiler.Interactive.Settings\\*\\*\\*\\FSharp.Compiler.Interactive.Settings.resources.dll",
16+
"bin\\fsc\\*\\*\\fsc.exe",
17+
"bin\\fsi\\*\\*\\fsi.exe",
18+
"bin\\fsiAnyCpu\\*\\*\\fsiAnyCpu.exe",
19+
"bin\\FSharp.VS.FSI\\*\\*\\FSharp.VS.FSI.dll",
20+
"bin\\FSharp.VS.FSI\\*\\*\\*\\FSharp.VS.FSI.resources.dll",
21+
"bin\\FSharp.LanguageService.Base\\*\\*\\FSharp.LanguageService.Base.dll",
22+
"bin\\FSharp.LanguageService.Base\\*\\*\\*\\FSharp.LanguageService.Base.resources.dll",
23+
"bin\\FSharp.LanguageService\\*\\*\\FSharp.LanguageService.dll",
24+
"bin\\FSharp.LanguageService\\*\\*\\*\\FSharp.LanguageService.resources.dll",
25+
"bin\\FSharp.UIResources\\*\\*\\FSharp.UIResources.dll",
26+
"bin\\FSharp.UIResources\\*\\*\\*\\FSharp.UIResources.resources.dll",
27+
"bin\\FSharp.Editor\\*\\*\\FSharp.Editor.dll",
28+
"bin\\FSharp.Editor\\*\\*\\*\\FSharp.Editor.resources.dll",
29+
"bin\\FSharp.PatternMatcher\\*\\*\\FSharp.PatternMatcher.dll",
30+
"bin\\FSharp.PropertiesPages\\*\\*\\FSharp.ProjectSystem.PropertyPages.dll",
31+
"bin\\FSharp.PropertiesPages\\*\\*\\*\\FSharp.ProjectSystem.PropertyPages.resources.dll",
32+
"bin\\ProjectSystem\\*\\*\\FSharp.ProjectSystem.FSharp.dll",
33+
"bin\\ProjectSystem\\*\\*\\*\\FSharp.ProjectSystem.FSharp.resources.dll",
34+
"bin\\ProjectSystem.Base\\*\\*\\FSharp.ProjectSystem.Base.dll",
35+
"bin\\ProjectSystem.Base\\*\\*\\*\\FSharp.ProjectSystem.Base.resources.dll"
3636
]
3737
},
3838
{
3939
"certificate":"VsixSHA2",
4040
"strongName":null,
4141
"values": [
42-
"VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
43-
"VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
44-
"..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
45-
"..\\VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
42+
"bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix",
43+
"bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix",
44+
"VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix",
45+
"VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix"
4646
]
4747
}
4848
],

‎build/targets/AssemblyVersions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3131

3232
<VSMajorVersion>15</VSMajorVersion>
33-
<VSMinorVersion>8</VSMinorVersion>
33+
<VSMinorVersion>9</VSMinorVersion>
3434
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
3535
<VSAssemblyVersion>$(VSMajorVersion).$(VSMinorVersion).0.0</VSAssemblyVersion>
3636

‎setup/Swix/Microsoft.FSharp.vsmanproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<PropertyGroup>
77
<FinalizeManifest>true</FinalizeManifest>
88
<FinalizeSkipLayout>true</FinalizeSkipLayout>
9-
<InsertionDir>$(OutputPath)\Insertion</InsertionDir>
9+
<OutputPath>$(ArtifactsDir)\VSSetup\$(Configuration)\Insertion</OutputPath>
10+
<InsertionDir>$(OutputPath)</InsertionDir>
1011
<ManifestBuildVersion>$(FSharpPackageVersion)</ManifestBuildVersion>
1112
</PropertyGroup>
1213

‎vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<AssemblyName>VisualFSharpTemplate</AssemblyName>
77
<OutputType>Library</OutputType>
88
<ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
9-
<DeployExtension>true</DeployExtension>
109
</PropertyGroup>
1110

1211
<ItemGroup>

0 commit comments

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