From 16fe45d0e0432a14e2b53e58328b13501279853a Mon Sep 17 00:00:00 2001 From: Steve Molloy Date: Thu, 24 May 2018 09:53:21 -0700 Subject: [PATCH 1/5] Fixing projects to actually induce signing in the new build system. --- src/Azure/Azure.csproj | 1 + src/Base/Base.csproj | 1 + src/Environment/Environment.csproj | 1 + src/Json/Json.csproj | 1 + src/UserSecrets/UserSecrets.csproj | 1 + tools/MicrosoftConfigurationBuilders.settings.targets | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Azure/Azure.csproj b/src/Azure/Azure.csproj index 14a7c1f..f1ef15c 100644 --- a/src/Azure/Azure.csproj +++ b/src/Azure/Azure.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU diff --git a/src/Base/Base.csproj b/src/Base/Base.csproj index f1af37b..abf622a 100644 --- a/src/Base/Base.csproj +++ b/src/Base/Base.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU diff --git a/src/Environment/Environment.csproj b/src/Environment/Environment.csproj index d2f161c..07339d0 100644 --- a/src/Environment/Environment.csproj +++ b/src/Environment/Environment.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU diff --git a/src/Json/Json.csproj b/src/Json/Json.csproj index 36877bd..2ae3b60 100644 --- a/src/Json/Json.csproj +++ b/src/Json/Json.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU diff --git a/src/UserSecrets/UserSecrets.csproj b/src/UserSecrets/UserSecrets.csproj index f2c3c48..76960e3 100644 --- a/src/UserSecrets/UserSecrets.csproj +++ b/src/UserSecrets/UserSecrets.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets index 54088dd..7d7b548 100644 --- a/tools/MicrosoftConfigurationBuilders.settings.targets +++ b/tools/MicrosoftConfigurationBuilders.settings.targets @@ -17,7 +17,7 @@ 2016 1 0 - 0 + 1 $(VersionRelease)-$(BuildQuality) From 54492e0dc34160f76832a333ca3f6bdd0f990b21 Mon Sep 17 00:00:00 2001 From: Steve Molloy Date: Thu, 24 May 2018 10:04:22 -0700 Subject: [PATCH 2/5] Target Build, not UnitTest --- tools/MicrosoftConfigurationBuilders.Extensions.targets | 2 +- tools/MicrosoftConfigurationBuilders.settings.targets | 2 +- tools/cleanup.targets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/MicrosoftConfigurationBuilders.Extensions.targets b/tools/MicrosoftConfigurationBuilders.Extensions.targets index 856da58..45fe7ce 100644 --- a/tools/MicrosoftConfigurationBuilders.Extensions.targets +++ b/tools/MicrosoftConfigurationBuilders.Extensions.targets @@ -1,4 +1,4 @@ - + diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets index 7d7b548..023fa30 100644 --- a/tools/MicrosoftConfigurationBuilders.settings.targets +++ b/tools/MicrosoftConfigurationBuilders.settings.targets @@ -1,4 +1,4 @@ - + $(MSBuildThisFileDirectory)MicrosoftConfigurationBuilders.Extensions.settings.targets $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'MicrosoftConfigurationBuilders.sln'))\ diff --git a/tools/cleanup.targets b/tools/cleanup.targets index 41a92f8..86ba5cc 100644 --- a/tools/cleanup.targets +++ b/tools/cleanup.targets @@ -1,4 +1,4 @@ - + From c3a7b2293d9b9e2c2ed893b7b946218fdc055db9 Mon Sep 17 00:00:00 2001 From: Steve Molloy Date: Thu, 24 May 2018 10:12:17 -0700 Subject: [PATCH 3/5] Get version from .targets. --- src/Azure/Properties/AssemblyInfo.cs | 13 ------------- src/Base/Properties/AssemblyInfo.cs | 13 ------------- src/Environment/Properties/AssemblyInfo.cs | 13 ------------- src/Json/Properties/AssemblyInfo.cs | 13 ------------- src/UserSecrets/Properties/AssemblyInfo.cs | 13 ------------- .../MicrosoftConfigurationBuilders.settings.targets | 5 +++-- 6 files changed, 3 insertions(+), 67 deletions(-) diff --git a/src/Azure/Properties/AssemblyInfo.cs b/src/Azure/Properties/AssemblyInfo.cs index d5260e3..901f637 100644 --- a/src/Azure/Properties/AssemblyInfo.cs +++ b/src/Azure/Properties/AssemblyInfo.cs @@ -21,16 +21,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("345c5437-4990-45dc-be34-6e37aa05d8d2")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Base/Properties/AssemblyInfo.cs b/src/Base/Properties/AssemblyInfo.cs index be698e5..a9fb92e 100644 --- a/src/Base/Properties/AssemblyInfo.cs +++ b/src/Base/Properties/AssemblyInfo.cs @@ -21,16 +21,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f382fbf8-146d-4968-a199-90d37f9ef9a7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Environment/Properties/AssemblyInfo.cs b/src/Environment/Properties/AssemblyInfo.cs index be698e5..a9fb92e 100644 --- a/src/Environment/Properties/AssemblyInfo.cs +++ b/src/Environment/Properties/AssemblyInfo.cs @@ -21,16 +21,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f382fbf8-146d-4968-a199-90d37f9ef9a7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Json/Properties/AssemblyInfo.cs b/src/Json/Properties/AssemblyInfo.cs index 8880f78..18e5f84 100644 --- a/src/Json/Properties/AssemblyInfo.cs +++ b/src/Json/Properties/AssemblyInfo.cs @@ -21,16 +21,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("84e0ce5d-4af2-414f-a940-22b3f93fc727")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/UserSecrets/Properties/AssemblyInfo.cs b/src/UserSecrets/Properties/AssemblyInfo.cs index be698e5..a9fb92e 100644 --- a/src/UserSecrets/Properties/AssemblyInfo.cs +++ b/src/UserSecrets/Properties/AssemblyInfo.cs @@ -21,16 +21,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f382fbf8-146d-4968-a199-90d37f9ef9a7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets index 023fa30..6aec4fd 100644 --- a/tools/MicrosoftConfigurationBuilders.settings.targets +++ b/tools/MicrosoftConfigurationBuilders.settings.targets @@ -17,12 +17,13 @@ 2016 1 0 - 1 + 0 $(VersionRelease)-$(BuildQuality) - $(VersionMajor).$(VersionMinor).$(VersionRelease) + $(VersionMajor).$(VersionMinor).1 + $(VersionMajor).$(VersionMinor).1 From ef444015d640452dd6a0cfbe8621c171d388a735 Mon Sep 17 00:00:00 2001 From: Steve Molloy Date: Thu, 24 May 2018 12:45:25 -0700 Subject: [PATCH 4/5] Fix output paths to correctly package signed binaries. --- src/Azure/Azure.csproj | 5 +++-- src/Base/Base.csproj | 5 +++-- src/Environment/Environment.csproj | 5 +++-- src/Json/Json.csproj | 5 +++-- src/UserSecrets/UserSecrets.csproj | 5 +++-- ...crosoft.Configuration.ConfigurationBuilders.Azure.nuproj | 6 +++--- ...icrosoft.Configuration.ConfigurationBuilders.Base.nuproj | 6 +++--- ...t.Configuration.ConfigurationBuilders.Environment.nuproj | 6 +++--- ...icrosoft.Configuration.ConfigurationBuilders.Json.nuproj | 6 +++--- ...t.Configuration.ConfigurationBuilders.UserSecrets.nuproj | 6 +++--- ...crosoftConfigurationBuilders.Extensions.settings.targets | 6 +++--- tools/MicrosoftConfigurationBuilders.settings.targets | 4 ++-- 12 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/Azure/Azure.csproj b/src/Azure/Azure.csproj index f1ef15c..43153f0 100644 --- a/src/Azure/Azure.csproj +++ b/src/Azure/Azure.csproj @@ -12,6 +12,7 @@ Microsoft.Configuration.ConfigurationBuilders.Azure v4.7.1 512 + $(OutputPath)$(AssemblyName).xml true true @@ -23,18 +24,18 @@ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + ..\obj\ pdbonly true - bin\Release\ TRACE prompt 4 + ..\obj\ diff --git a/src/Base/Base.csproj b/src/Base/Base.csproj index abf622a..8f51eb3 100644 --- a/src/Base/Base.csproj +++ b/src/Base/Base.csproj @@ -12,6 +12,7 @@ Microsoft.Configuration.ConfigurationBuilders.Base v4.7.1 512 + $(OutputPath)$(AssemblyName).xml true true @@ -21,18 +22,18 @@ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + ..\obj\ pdbonly true - bin\Release\ TRACE prompt 4 + ..\obj\ diff --git a/src/Environment/Environment.csproj b/src/Environment/Environment.csproj index 07339d0..b4f7a0f 100644 --- a/src/Environment/Environment.csproj +++ b/src/Environment/Environment.csproj @@ -12,6 +12,7 @@ Microsoft.Configuration.ConfigurationBuilders.Environment v4.7.1 512 + $(OutputPath)$(AssemblyName).xml true true @@ -21,18 +22,18 @@ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + ..\obj\ pdbonly true - bin\Release\ TRACE prompt 4 + ..\obj\ diff --git a/src/Json/Json.csproj b/src/Json/Json.csproj index 2ae3b60..4c462e9 100644 --- a/src/Json/Json.csproj +++ b/src/Json/Json.csproj @@ -12,6 +12,7 @@ Microsoft.Configuration.ConfigurationBuilders.Json v4.7.1 512 + $(OutputPath)$(AssemblyName).xml true true @@ -21,18 +22,18 @@ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + ..\obj\ pdbonly true - bin\Release\ TRACE prompt 4 + ..\obj\ diff --git a/src/UserSecrets/UserSecrets.csproj b/src/UserSecrets/UserSecrets.csproj index 76960e3..67b6138 100644 --- a/src/UserSecrets/UserSecrets.csproj +++ b/src/UserSecrets/UserSecrets.csproj @@ -12,6 +12,7 @@ Microsoft.Configuration.ConfigurationBuilders.UserSecrets v4.7.1 512 + $(OutputPath)$(AssemblyName).xml true true @@ -21,18 +22,18 @@ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + ..\obj\ pdbonly true - bin\Release\ TRACE prompt 4 + ..\obj\ diff --git a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj index df90762..b50edde 100644 --- a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj +++ b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj @@ -8,17 +8,17 @@ - $(RepositoryRoot)\src\Azure\bin\$(Configuration)\ + $(AssemblyPath) lib\Net471 - $(RepositoryRoot)\src\Azure\bin\$(Configuration)\ + $(OutputPath) lib\Net471 diff --git a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj index 2b7b90a..a3354a8 100644 --- a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj +++ b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj @@ -8,17 +8,17 @@ - $(RepositoryRoot)\src\Base\bin\$(Configuration)\ + $(AssemblyPath) lib\Net471 - $(RepositoryRoot)\src\Base\bin\$(Configuration)\ + $(OutputPath) lib\Net471 diff --git a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj index 88c7b63..719ea73 100644 --- a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj +++ b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj @@ -8,17 +8,17 @@ - $(RepositoryRoot)\src\Environment\bin\$(Configuration)\ + $(AssemblyPath) lib\Net471 - $(RepositoryRoot)\src\Environment\bin\$(Configuration)\ + $(OutputPath) lib\Net471 diff --git a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj index 17fa9e1..05974c9 100644 --- a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj +++ b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj @@ -8,17 +8,17 @@ - $(RepositoryRoot)\src\Json\bin\$(Configuration)\ + $(AssemblyPath) lib\Net471 - $(RepositoryRoot)\src\Json\bin\$(Configuration)\ + $(OutputPath) lib\Net471 diff --git a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj index 272d14a..7df6390 100644 --- a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj +++ b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj @@ -8,17 +8,17 @@ - $(RepositoryRoot)\src\UserSecrets\bin\$(Configuration)\ + $(AssemblyPath) lib\Net471 - $(RepositoryRoot)\src\UserSecrets\bin\$(Configuration)\ + $(OutputPath) lib\Net471 diff --git a/tools/MicrosoftConfigurationBuilders.Extensions.settings.targets b/tools/MicrosoftConfigurationBuilders.Extensions.settings.targets index 0523054..03e6825 100644 --- a/tools/MicrosoftConfigurationBuilders.Extensions.settings.targets +++ b/tools/MicrosoftConfigurationBuilders.Extensions.settings.targets @@ -6,10 +6,10 @@ Release - $(MSBuildProjectDirectory)\..\bin\ - $(MSBuildProjectDirectory)\..\obj\ + $(RepositoryRootEx)bin\ + $(RepositoryRootEx)obj\ $(BinPath)$(Configuration)\ - $(ObjPath)$(Configuration)\ + $(ObjPath)$(Configuration)\$(MSBuildProjectName)\ diff --git a/tools/MicrosoftConfigurationBuilders.settings.targets b/tools/MicrosoftConfigurationBuilders.settings.targets index 6aec4fd..8358296 100644 --- a/tools/MicrosoftConfigurationBuilders.settings.targets +++ b/tools/MicrosoftConfigurationBuilders.settings.targets @@ -35,8 +35,8 @@ Release - $(RepositoryRoot)\src\packages\bin\$(Configuration)\ - $(RepositoryRoot)\src\packages\obj\$(Configuration)\ + $(RepositoryRoot)bin\$(Configuration)\ + $(RepositoryRoot)obj\$(Configuration)\$(MSBuildProjectName)\ From 92d93626ad7b5d5839fbbdd6b37f3f204341c43f Mon Sep 17 00:00:00 2001 From: Steve Molloy Date: Thu, 24 May 2018 15:42:56 -0700 Subject: [PATCH 5/5] Mark package projects, so APIScan leaves them alone. --- .../Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj | 1 + .../Microsoft.Configuration.ConfigurationBuilders.Base.nuproj | 1 + ...rosoft.Configuration.ConfigurationBuilders.Environment.nuproj | 1 + .../Microsoft.Configuration.ConfigurationBuilders.Json.nuproj | 1 + ...rosoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj | 1 + 5 files changed, 5 insertions(+) diff --git a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj index b50edde..f2308d2 100644 --- a/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj +++ b/src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj @@ -5,6 +5,7 @@ Microsoft.Configuration.ConfigurationBuilders.Azure $(MSBuildProjectName) Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec + true diff --git a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj index a3354a8..1aaea20 100644 --- a/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj +++ b/src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj @@ -5,6 +5,7 @@ Microsoft.Configuration.ConfigurationBuilders.Base $(MSBuildProjectName) Microsoft.Configuration.ConfigurationBuilders.Base.nuspec + true diff --git a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj index 719ea73..993aa4f 100644 --- a/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj +++ b/src/packages/ConfigurationBuilders.Environment.nupkg/Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj @@ -5,6 +5,7 @@ Microsoft.Configuration.ConfigurationBuilders.Environment $(MSBuildProjectName) Microsoft.Configuration.ConfigurationBuilders.Environment.nuspec + true diff --git a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj index 05974c9..b8604ef 100644 --- a/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj +++ b/src/packages/ConfigurationBuilders.Json.nupkg/Microsoft.Configuration.ConfigurationBuilders.Json.nuproj @@ -5,6 +5,7 @@ Microsoft.Configuration.ConfigurationBuilders.Json $(MSBuildProjectName) Microsoft.Configuration.ConfigurationBuilders.Json.nuspec + true diff --git a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj index 7df6390..17bc54b 100644 --- a/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj +++ b/src/packages/ConfigurationBuilders.UserSecrets.nupkg/Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj @@ -5,6 +5,7 @@ Microsoft.Configuration.ConfigurationBuilders.UserSecrets $(MSBuildProjectName) Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuspec + true