Skip to content

Commit

Permalink
Fix signing (#403)
Browse files Browse the repository at this point in the history 
* Move signing projects into separate solution
* Default to Release configuration for binary signing
  • Loading branch information
@karolz-ms
karolz-ms committed Apr 22, 2022
1 parent 4b71137 commit 750b8c0
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 23 deletions.
40 changes: 40 additions & 0 deletions Warsaw-signing.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.0.32002.185
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.EventFlow.NugetSigning", "src\Microsoft.Diagnostics.EventFlow.NugetSigning\Microsoft.Diagnostics.EventFlow.NugetSigning.csproj", "{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.EventFlow.Signing", "src\Microsoft.Diagnostics.EventFlow.Signing\Microsoft.Diagnostics.EventFlow.Signing.csproj", "{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|x64.ActiveCfg = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|x64.Build.0 = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|Any CPU.Build.0 = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|x64.ActiveCfg = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|x64.Build.0 = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|x64.ActiveCfg = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|x64.Build.0 = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|Any CPU.Build.0 = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|x64.ActiveCfg = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8F1BC23F-956D-4D83-B675-710B743F08EF}
EndGlobalSection
EndGlobal
22 changes: 0 additions & 22 deletions Warsaw.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Event
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.EventFlow.Inputs.NLog", "src\Microsoft.Diagnostics.EventFlow.Inputs.NLog\Microsoft.Diagnostics.EventFlow.Inputs.NLog.csproj", "{B19F59CA-8030-40EB-BF22-6A4B1B896C37}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.EventFlow.NugetSigning", "src\Microsoft.Diagnostics.EventFlow.NugetSigning\Microsoft.Diagnostics.EventFlow.NugetSigning.csproj", "{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.EventFlow.Inputs.DiagnosticSource", "src\Microsoft.Diagnostics.EventFlow.Inputs.DiagnosticSource\Microsoft.Diagnostics.EventFlow.Inputs.DiagnosticSource.csproj", "{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.EventFlow.Signing", "src\Microsoft.Diagnostics.EventFlow.Signing\Microsoft.Diagnostics.EventFlow.Signing.csproj", "{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.EventFlow.Inputs.ActivitySource", "src\Microsoft.Diagnostics.EventFlow.Inputs.ActivitySource\Microsoft.Diagnostics.EventFlow.Inputs.ActivitySource.csproj", "{4B9EF551-2476-4494-9A5E-C52A97505CD4}"
EndProject
Global
Expand Down Expand Up @@ -296,14 +292,6 @@ Global
{B19F59CA-8030-40EB-BF22-6A4B1B896C37}.Release|Any CPU.Build.0 = Release|Any CPU
{B19F59CA-8030-40EB-BF22-6A4B1B896C37}.Release|x64.ActiveCfg = Release|Any CPU
{B19F59CA-8030-40EB-BF22-6A4B1B896C37}.Release|x64.Build.0 = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|x64.ActiveCfg = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Debug|x64.Build.0 = Debug|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|Any CPU.Build.0 = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|x64.ActiveCfg = Release|Any CPU
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418}.Release|x64.Build.0 = Release|Any CPU
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand All @@ -312,14 +300,6 @@ Global
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Release|Any CPU.Build.0 = Release|Any CPU
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Release|x64.ActiveCfg = Release|Any CPU
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10}.Release|x64.Build.0 = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|x64.ActiveCfg = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Debug|x64.Build.0 = Debug|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|Any CPU.Build.0 = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|x64.ActiveCfg = Release|Any CPU
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}.Release|x64.Build.0 = Release|Any CPU
{4B9EF551-2476-4494-9A5E-C52A97505CD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B9EF551-2476-4494-9A5E-C52A97505CD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B9EF551-2476-4494-9A5E-C52A97505CD4}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -358,9 +338,7 @@ Global
{3E372AAF-E93E-4F71-B006-C0DF9B2DA5D2} = {5AD3BB0F-B6F8-4361-AC2D-CC3514DA37A0}
{B9C6A35D-D70A-4F0A-8074-6EC249B2D5B2} = {47200F40-43E1-4B09-B803-A921FED2BF05}
{B19F59CA-8030-40EB-BF22-6A4B1B896C37} = {47200F40-43E1-4B09-B803-A921FED2BF05}
{C1CB9BDC-2F26-46AA-9F2C-F9C12E9A3418} = {FC86C736-6428-431B-B83F-940BF7182757}
{A53665AF-C4B4-4DD8-B002-F8065C1A3D10} = {47200F40-43E1-4B09-B803-A921FED2BF05}
{69AA6421-82A5-43BF-AD27-8E2C172FF8CE} = {FC86C736-6428-431B-B83F-940BF7182757}
{4B9EF551-2476-4494-9A5E-C52A97505CD4} = {47200F40-43E1-4B09-B803-A921FED2BF05}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Diagnostics.EventFlow.Signing/Microsoft.Diagnostics.EventFlow.Signing.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props" Condition="Exists('..\..\packages\MicroBuild.Core.0.3.0\build\MicroBuild.Core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{69AA6421-82A5-43BF-AD27-8E2C172FF8CE}</ProjectGuid>
<OutputType>Library</OutputType>
Expand Down

0 comments on commit 750b8c0

Please sign in to comment.