Skip to content

Commit ef44401

Browse files
StephenMolloyStephenMolloy
committed
Fix output paths to correctly package signed binaries.
1 parent c3a7b22 commit ef44401

File tree

12 files changed

+35
-30
lines changed

12 files changed

+35
-30
lines changed

‎src/Azure/Azure.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Azure</AssemblyName>
1313
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1516
<TargetFrameworkProfile />
1617
<SignAssembly>true</SignAssembly>
1718
<DelaySign>true</DelaySign>
@@ -23,18 +24,18 @@
2324
<DebugSymbols>true</DebugSymbols>
2425
<DebugType>full</DebugType>
2526
<Optimize>false</Optimize>
26-
<OutputPath>bin\Debug\</OutputPath>
2727
<DefineConstants>DEBUG;TRACE</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
30+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3031
</PropertyGroup>
3132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3233
<DebugType>pdbonly</DebugType>
3334
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
3535
<DefineConstants>TRACE</DefineConstants>
3636
<ErrorReport>prompt</ErrorReport>
3737
<WarningLevel>4</WarningLevel>
38+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3839
</PropertyGroup>
3940
<ItemGroup>
4041
<Reference Include="Microsoft.Azure.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Base/Base.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Base</AssemblyName>
1313
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1516
<TargetFrameworkProfile />
1617
<SignAssembly>true</SignAssembly>
1718
<DelaySign>true</DelaySign>
@@ -21,18 +22,18 @@
2122
<DebugSymbols>true</DebugSymbols>
2223
<DebugType>full</DebugType>
2324
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<DebugType>pdbonly</DebugType>
3132
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3637
</PropertyGroup>
3738
<ItemGroup>
3839
<Reference Include="System" />

‎src/Environment/Environment.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Environment</AssemblyName>
1313
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1516
<TargetFrameworkProfile />
1617
<SignAssembly>true</SignAssembly>
1718
<DelaySign>true</DelaySign>
@@ -21,18 +22,18 @@
2122
<DebugSymbols>true</DebugSymbols>
2223
<DebugType>full</DebugType>
2324
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<DebugType>pdbonly</DebugType>
3132
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3637
</PropertyGroup>
3738
<ItemGroup>
3839
<Reference Include="System" />

‎src/Json/Json.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.Json</AssemblyName>
1313
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1516
<TargetFrameworkProfile />
1617
<SignAssembly>true</SignAssembly>
1718
<DelaySign>true</DelaySign>
@@ -21,18 +22,18 @@
2122
<DebugSymbols>true</DebugSymbols>
2223
<DebugType>full</DebugType>
2324
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<DebugType>pdbonly</DebugType>
3132
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3637
</PropertyGroup>
3738
<ItemGroup>
3839
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">

‎src/UserSecrets/UserSecrets.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<AssemblyName>Microsoft.Configuration.ConfigurationBuilders.UserSecrets</AssemblyName>
1313
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15+
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
1516
<TargetFrameworkProfile />
1617
<SignAssembly>true</SignAssembly>
1718
<DelaySign>true</DelaySign>
@@ -21,18 +22,18 @@
2122
<DebugSymbols>true</DebugSymbols>
2223
<DebugType>full</DebugType>
2324
<Optimize>false</Optimize>
24-
<OutputPath>bin\Debug\</OutputPath>
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
2829
</PropertyGroup>
2930
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3031
<DebugType>pdbonly</DebugType>
3132
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36+
<BaseIntermediateOutputPath>..\obj\</BaseIntermediateOutputPath>
3637
</PropertyGroup>
3738
<ItemGroup>
3839
<Reference Include="System" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<NuGetContent Include="$(AssemblyName).dll">
11-
<Source>$(RepositoryRoot)\src\Azure\bin\$(Configuration)\</Source>
11+
<Source>$(AssemblyPath)</Source>
1212
<Destination>lib\Net471</Destination>
1313
</NuGetContent>
1414
<!--
1515
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(RepositoryRoot)\src\Azure\bin\$(Configuration)\</Source>
16+
<Source>$(OutputPath)</Source>
1717
<Destination>lib\Net471</Destination>
1818
</NuGetContent>
1919
-->
2020
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
21-
<Source>$(RepositoryRoot)\src\Azure\bin\$(Configuration)\</Source>
21+
<Source>$(OutputPath)</Source>
2222
<Destination>lib\Net471</Destination>
2323
</NuGetContent>
2424
<NuGetContentProject Include="$(RepositoryRoot)\src\Azure\Azure.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<NuGetContent Include="$(AssemblyName).dll">
11-
<Source>$(RepositoryRoot)\src\Base\bin\$(Configuration)\</Source>
11+
<Source>$(AssemblyPath)</Source>
1212
<Destination>lib\Net471</Destination>
1313
</NuGetContent>
1414
<!--
1515
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(RepositoryRoot)\src\Base\bin\$(Configuration)\</Source>
16+
<Source>$(OutputPath)</Source>
1717
<Destination>lib\Net471</Destination>
1818
</NuGetContent>
1919
-->
2020
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
21-
<Source>$(RepositoryRoot)\src\Base\bin\$(Configuration)\</Source>
21+
<Source>$(OutputPath)</Source>
2222
<Destination>lib\Net471</Destination>
2323
</NuGetContent>
2424
<NuGetContentProject Include="$(RepositoryRoot)\src\Base\Base.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<NuGetContent Include="$(AssemblyName).dll">
11-
<Source>$(RepositoryRoot)\src\Environment\bin\$(Configuration)\</Source>
11+
<Source>$(AssemblyPath)</Source>
1212
<Destination>lib\Net471</Destination>
1313
</NuGetContent>
1414
<!--
1515
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(RepositoryRoot)\src\Environment\bin\$(Configuration)\</Source>
16+
<Source>$(OutputPath)</Source>
1717
<Destination>lib\Net471</Destination>
1818
</NuGetContent>
1919
-->
2020
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
21-
<Source>$(RepositoryRoot)\src\Environment\bin\$(Configuration)\</Source>
21+
<Source>$(OutputPath)</Source>
2222
<Destination>lib\Net471</Destination>
2323
</NuGetContent>
2424
<NuGetContentProject Include="$(RepositoryRoot)\src\Environment\Environment.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<NuGetContent Include="$(AssemblyName).dll">
11-
<Source>$(RepositoryRoot)\src\Json\bin\$(Configuration)\</Source>
11+
<Source>$(AssemblyPath)</Source>
1212
<Destination>lib\Net471</Destination>
1313
</NuGetContent>
1414
<!--
1515
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(RepositoryRoot)\src\Json\bin\$(Configuration)\</Source>
16+
<Source>$(OutputPath)</Source>
1717
<Destination>lib\Net471</Destination>
1818
</NuGetContent>
1919
-->
2020
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
21-
<Source>$(RepositoryRoot)\src\Json\bin\$(Configuration)\</Source>
21+
<Source>$(OutputPath)</Source>
2222
<Destination>lib\Net471</Destination>
2323
</NuGetContent>
2424
<NuGetContentProject Include="$(RepositoryRoot)\src\Json\Json.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<NuGetContent Include="$(AssemblyName).dll">
11-
<Source>$(RepositoryRoot)\src\UserSecrets\bin\$(Configuration)\</Source>
11+
<Source>$(AssemblyPath)</Source>
1212
<Destination>lib\Net471</Destination>
1313
</NuGetContent>
1414
<!--
1515
<NuGetContent Include="$(AssemblyName).xml">
16-
<Source>$(RepositoryRoot)\src\UserSecrets\bin\$(Configuration)\</Source>
16+
<Source>$(OutputPath)</Source>
1717
<Destination>lib\Net471</Destination>
1818
</NuGetContent>
1919
-->
2020
<NuGetContent Include="$(AssemblyName).pdb" Condition="'$(NuGetPackSymbols)' == 'true'">
21-
<Source>$(RepositoryRoot)\src\UserSecrets\bin\$(Configuration)\</Source>
21+
<Source>$(OutputPath)</Source>
2222
<Destination>lib\Net471</Destination>
2323
</NuGetContent>
2424
<NuGetContentProject Include="$(RepositoryRoot)\src\UserSecrets\UserSecrets.csproj" Condition="'$(NuGetPackSymbols)' == 'true'" />

‎tools/MicrosoftConfigurationBuilders.Extensions.settings.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<PropertyGroup>
88
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
9-
<BinPath>$(MSBuildProjectDirectory)\..\bin\</BinPath>
10-
<ObjPath>$(MSBuildProjectDirectory)\..\obj\</ObjPath>
9+
<BinPath>$(RepositoryRootEx)bin\</BinPath>
10+
<ObjPath>$(RepositoryRootEx)obj\</ObjPath>
1111
<OutputPath>$(BinPath)$(Configuration)\</OutputPath>
12-
<IntermediateOutputPath>$(ObjPath)$(Configuration)\</IntermediateOutputPath>
12+
<IntermediateOutputPath>$(ObjPath)$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
1313
</PropertyGroup>
1414

1515
<PropertyGroup>

‎tools/MicrosoftConfigurationBuilders.settings.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
<PropertyGroup Label="Common Configuration">
3737
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
38-
<OutputPath>$(RepositoryRoot)\src\packages\bin\$(Configuration)\</OutputPath>
39-
<IntermediateOutputPath>$(RepositoryRoot)\src\packages\obj\$(Configuration)\</IntermediateOutputPath>
38+
<OutputPath>$(RepositoryRoot)bin\$(Configuration)\</OutputPath>
39+
<IntermediateOutputPath>$(RepositoryRoot)obj\$(Configuration)\$(MSBuildProjectName)\</IntermediateOutputPath>
4040
</PropertyGroup>
4141

4242
<PropertyGroup>

0 commit comments

Comments
 (0)