Skip to content

Commit 003df05

Browse files
StephenMolloyHongGit
StephenMolloy
authored and
HongGit
committed
Package versioning update (#26)
* More solution cleanup. Add simple *.ps1 preprocessing. * Move to powershell management of config - so we don't obliterate stuff in the upgrade scenario. * Whoops. Didn't mean to actually update the version. * Don't try to sign nuget script files before they are preprocessed. * Skip signing verification of xmldoc files in nuget packages. * Refactor common un/install steps in powershell.
1 parent 956645f commit 003df05

35 files changed

Lines changed: 513 additions & 395 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
src/**/[Bb]in/
44
src/**/[Oo]bj/
55
src/packages/**/signed/
6+
src/packages/**/pp/
67
test/**/[Bb]in/
78
test/**/[Oo]bj/
89
.vs/

‎src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\MicrosoftConfigurationBuilders.settings.targets" />
44
<PropertyGroup>
5-
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Azure</AssemblyName>
5+
<BuilderType>Microsoft.Configuration.ConfigurationBuilders.AzureKeyVaultConfigBuilder</BuilderType>
6+
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
67
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
7-
<NuSpecFile>Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec</NuSpecFile>
8+
<NuSpecFile>$(MSBuildProjectName).nuspec</NuSpecFile>
89
<IsPackage>true</IsPackage>
910
</PropertyGroup>
1011
<ItemGroup>
@@ -21,19 +22,24 @@
2122
<Destination>lib\Net471</Destination>
2223
</NuGetContent>
2324
<NuGetContentProject Include="$(RepositoryRoot)\src\Azure\Azure.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />
24-
<NuGetContent Include="Content\Net471\config.install.xdt">
25+
<NuGetContent Include="..\ConfigurationBuilders.Base.nupkg\shared\Content\Net471\config.install.xdt">
2526
<Destination>content\Net471\app.config.install.xdt</Destination>
2627
</NuGetContent>
27-
<NuGetContent Include="Content\Net471\config.install.xdt">
28+
<NuGetContent Include="..\ConfigurationBuilders.Base.nupkg\shared\Content\Net471\config.install.xdt">
2829
<Destination>content\Net471\web.config.install.xdt</Destination>
2930
</NuGetContent>
30-
<NuGetContent Include="Content\Net471\config.uninstall.xdt">
31+
<NuGetContent Include="..\ConfigurationBuilders.Base.nupkg\shared\Content\Net471\config.uninstall.xdt">
3132
<Destination>content\Net471\app.config.uninstall.xdt</Destination>
3233
</NuGetContent>
33-
<NuGetContent Include="Content\Net471\config.uninstall.xdt">
34+
<NuGetContent Include="..\ConfigurationBuilders.Base.nupkg\shared\Content\Net471\config.uninstall.xdt">
3435
<Destination>content\Net471\web.config.uninstall.xdt</Destination>
3536
</NuGetContent>
37+
<NuGetContent Include="tools\Net471\pp\*.ps1">
38+
<Destination>tools\Net471\</Destination>
39+
</NuGetContent>
40+
<NuGetContent Include="..\ConfigurationBuilders.Base.nupkg\shared\tools\Net471\pp\*.ps1">
41+
<Destination>tools\Net471\</Destination>
42+
</NuGetContent>
3643
</ItemGroup>
3744
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
38-
<Import Project="$(RepositoryRoot)Tools\signing.targets"/>
3945
</Project>

‎src/packages/ConfigurationBuilders.Azure.nupkg/Microsoft.Configuration.ConfigurationBuilders.Azure.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<tags>Microsoft Configuration Builders Azure</tags>
1818

1919
<dependencies>
20-
<dependency id="Microsoft.Configuration.ConfigurationBuilders.Base" version="[$NuGetPackageVersion$]" />
20+
<dependency id="Microsoft.Configuration.ConfigurationBuilders.Base" version="$NuGetPackageBaseDependencyVersion$" />
2121
<dependency id="Microsoft.Azure.KeyVault" version="2.3.2" />
2222
<dependency id="Microsoft.Azure.Services.AppAuthentication" version="1.0.1" />
2323
</dependencies>

‎src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.install.xdt‎

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

‎src/packages/ConfigurationBuilders.Azure.nupkg/content/Net471/config.uninstall.xdt‎

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

‎src/packages/ConfigurationBuilders.Azure.nupkg/tools/Net471/Install.ps1‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copyright (c) .NET Foundation. All rights reserved.
2+
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
param($installPath, $toolsPath, $package, $project)
5+
6+
. "$PSScriptRoot\KeyValueConfigBuildersCommon.ps1"
7+
8+
##### Describe the AzureKeyVault config builder #####
9+
$keyVaultConfigBuilder = [BuilderDescription]@{
10+
TypeName="$typeName$";
11+
Assembly="$assemblyName$";
12+
Version="$assemblyVersion$";
13+
DefaultName="AzureKeyVault";
14+
AllowedParameters=@( $keyValueCommonParameters +
15+
[ParameterDescription]@{ Name="vaultName"; IsRequired=$false; DefaultValue="[VaultName]" },
16+
[ParameterDescription]@{ Name="uri"; IsRequired=$false },
17+
[ParameterDescription]@{ Name="connectionString"; IsRequired=$false },
18+
[ParameterDescription]@{ Name="version"; IsRequired=$false },
19+
[ParameterDescription]@{ Name="preloadSecretNames"; IsRequired=$false });
20+
}
21+
22+
CommonInstall $keyVaultConfigBuilder

‎src/packages/ConfigurationBuilders.Azure.nupkg/tools/Net471/Uninstall.ps1‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Copyright (c) .NET Foundation. All rights reserved.
2+
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
param($installPath, $toolsPath, $package, $project)
5+
6+
. "$PSScriptRoot\KeyValueConfigBuildersCommon.ps1"
7+
8+
CommonUninstall "$typeName$, $assemblyName$"

‎src/packages/ConfigurationBuilders.Base.nupkg/Microsoft.Configuration.ConfigurationBuilders.Base.nuproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),MicrosoftConfigurationBuilders.sln))\tools\MicrosoftConfigurationBuilders.settings.targets" />
44
<PropertyGroup>
5-
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Base</AssemblyName>
5+
<BuilderType>Microsoft.Configuration.ConfigurationBuilders.KeyValueConfigBuilder</BuilderType>
6+
<AssemblyName>$(MSBuildProjectName)</AssemblyName>
67
<NuGetPackageId>$(MSBuildProjectName)</NuGetPackageId>
7-
<NuSpecFile>Microsoft.Configuration.ConfigurationBuilders.Base.nuspec</NuSpecFile>
8+
<NuSpecFile>$(MSBuildProjectName).nuspec</NuSpecFile>
89
<IsPackage>true</IsPackage>
910
</PropertyGroup>
1011
<ItemGroup>
@@ -35,5 +36,4 @@
3536
</NuGetContent>
3637
</ItemGroup>
3738
<Import Project="$(RepositoryRoot)Tools\NuGetProj.targets"/>
38-
<Import Project="$(RepositoryRoot)Tools\signing.targets"/>
3939
</Project>

src/packages/ConfigurationBuilders.Environment.nupkg/content/Net471/config.install.xdt renamed to src/packages/ConfigurationBuilders.Base.nupkg/shared/content/Net471/config.install.xdt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33

4+
<!-- Ensure configBuilders section is declared -->
45
<configSections xdt:Transform="InsertBefore(/configuration/*[1])" />
56
<configSections xdt:Locator="XPath(/configuration/configSections[last()])">
67
<section name="configBuilders" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="System.Configuration.ConfigurationBuildersSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" restartOnExternalChanges="false" requirePermission="false"/>
78
</configSections>
89
<configSections xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
910

11+
<!-- Get configBuilders section ready to go for install.ps1 -->
1012
<configBuilders xdt:Transform="InsertAfter(/configuration/configSections)" />
1113
<configBuilders xdt:Locator="XPath(/configuration/configBuilders[last()])">
1214
<builders xdt:Transform="InsertIfMissing">
13-
<add name="Environment" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" type="Microsoft.Configuration.ConfigurationBuilders.EnvironmentConfigBuilder, Microsoft.Configuration.ConfigurationBuilders.Environment, Version=$version$, Culture=neutral" />
1415
</builders>
1516
</configBuilders>
1617
<configBuilders xdt:Transform="RemoveAll" xdt:Locator="Condition(count(*)=0)" />
1718

18-
</configuration>
19+
</configuration>

src/packages/ConfigurationBuilders.UserSecrets.nupkg/content/Net471/config.uninstall.xdt renamed to src/packages/ConfigurationBuilders.Base.nupkg/shared/content/Net471/config.uninstall.xdt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
33

4-
<configBuilders>
5-
<builders>
6-
<add name="Secrets" xdt:Locator="Match(name)" xdt:Transform="Remove" />
7-
</builders>
8-
</configBuilders>
94

105
<configSections>
116
<section name="configBuilders" xdt:Locator="Condition(@name='configBuilders' and count(/configuration/configBuilders/builders/*)=0)" xdt:Transform="Remove" />

0 commit comments

Comments
 (0)