Skip to content

Build fixes #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 20, 2020
Merged

Build fixes #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8a13b0
Allow nuget restore to be skipped in build pipeline.
StephenMolloy Feb 19, 2020
b7871e1
Update nuget config.
StephenMolloy Feb 20, 2020
860b4c9
Update nuget.exe
StephenMolloy Feb 20, 2020
354ae7d
Allow pipeline to build select packages instead of all of them every …
StephenMolloy Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .nuget/NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageSources>
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
</configuration>
Binary file modified .nuget/NuGet.exe
View file
Open in desktop
Binary file not shown.
13 changes: 7 additions & 6 deletions MicrosoftConfigurationBuilders.msbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

<ItemGroup>
<AssemblyProject Include="src\Base\Base.csproj" />
<AssemblyProject Include="src\Environment\Environment.csproj" />
<AssemblyProject Include="src\UserSecrets\UserSecrets.csproj" />
<AssemblyProject Include="src\Azure\Azure.csproj" />
<AssemblyProject Include="src\Json\Json.csproj" />
<AssemblyProject Include="src\AzureAppConfig\AzureAppConfig.csproj" />
<AssemblyProject Include="src\Environment\Environment.csproj" Condition="'$(SkipEnvironmentProj)' != 'true'" />
<AssemblyProject Include="src\UserSecrets\UserSecrets.csproj" Condition="'$(SkipUserSecretsProj)' != 'true'" />
<AssemblyProject Include="src\KeyPerFile\KeyPerFile.csproj" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
<AssemblyProject Include="src\Azure\Azure.csproj" Condition="'$(SkipAzureProj)' != 'true'" />
<AssemblyProject Include="src\Json\Json.csproj" Condition="'$(SkipJsonProj)' != 'true'" />
<AssemblyProject Include="src\AzureAppConfig\AzureAppConfig.csproj" Condition="'$(SkipAzureAppConfigProj)' != 'true'" />
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -62,7 +63,7 @@

<Target Name="RebuildPackages" DependsOnTargets="CleanPackages;BuildPackages" />

<Target Name="RestorePackages">
<Target Name="RestorePackages" Condition="'$(SkipPackageRestore)' != 'true'">
<Exec Command=".nuget\NuGet.exe restore" />
</Target>

Expand Down
12 changes: 6 additions & 6 deletions src/packages/packages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
</PropertyGroup>
<ItemGroup Label="Nuget Project Build Order">
<NuGetProject Include="ConfigurationBuilders.Base.nupkg\Microsoft.Configuration.ConfigurationBuilders.Base.nuproj" />
<NuGetProject Include="ConfigurationBuilders.Environment.nupkg\Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj" />
<NuGetProject Include="ConfigurationBuilders.UserSecrets.nupkg\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj" />
<NuGetProject Include="ConfigurationBuilders.KeyPerFile.nupkg\Microsoft.Configuration.ConfigurationBuilders.KeyPerFile.nuproj" />
<NuGetProject Include="ConfigurationBuilders.Azure.nupkg\Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj" />
<NuGetProject Include="ConfigurationBuilders.Json.nupkg\Microsoft.Configuration.ConfigurationBuilders.Json.nuproj" />
<NuGetProject Include="ConfigurationBuilders.AzureAppConfiguration.nupkg\Microsoft.Configuration.ConfigurationBuilders.AzureAppConfiguration.nuproj" />
<NuGetProject Include="ConfigurationBuilders.Environment.nupkg\Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj" Condition="'$(SkipEnvironmentProj)' != 'true'" />
<NuGetProject Include="ConfigurationBuilders.UserSecrets.nupkg\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj" Condition="'$(SkipUserSecretsProj)' != 'true'" />
<NuGetProject Include="ConfigurationBuilders.KeyPerFile.nupkg\Microsoft.Configuration.ConfigurationBuilders.KeyPerFile.nuproj" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
<NuGetProject Include="ConfigurationBuilders.Azure.nupkg\Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj" Condition="'$(SkipAzureProj)' != 'true'" />
<NuGetProject Include="ConfigurationBuilders.Json.nupkg\Microsoft.Configuration.ConfigurationBuilders.Json.nuproj" Condition="'$(SkipJsonProj)' != 'true'" />
<NuGetProject Include="ConfigurationBuilders.AzureAppConfiguration.nupkg\Microsoft.Configuration.ConfigurationBuilders.AzureAppConfiguration.nuproj" Condition="'$(SkipAzureAppConfigProj)' != 'true'" />
</ItemGroup>
<ItemGroup Label="Base">
<None Include="ConfigurationBuilders.Base.nupkg\Microsoft.Configuration.ConfigurationBuilders.Base.nuspec" />
Expand Down
16 changes: 8 additions & 8 deletions test/Microsoft.Configuration.ConfigurationBuilders.Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,32 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CommonBuilderTests.cs" />
<Compile Include="UserSecretsTests.cs" />
<Compile Include="KeyPerFileTests.cs" />
<Compile Include="SimpleJsonTests.cs" />
<Compile Include="UserSecretsTests.cs" Condition="'$(SkipUserSecretsProj)' != 'true'" />
<Compile Include="KeyPerFileTests.cs" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
<Compile Include="SimpleJsonTests.cs" Condition="'$(SkipJsonProj)' != 'true'" />
<Compile Include="UtilsTests.cs" />
<Compile Include="BaseTests.cs" />
<Compile Include="EnvironmentTests.cs" />
<Compile Include="EnvironmentTests.cs" Condition="'$(SkipEnvironmentProj)' != 'true'" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Base\Base.csproj">
<Project>{f382fbf8-146d-4968-a199-90d37f9ef9a7}</Project>
<Name>Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Environment\Environment.csproj">
<ProjectReference Include="..\..\src\Environment\Environment.csproj" Condition="'$(SkipEnvironmentProj)' != 'true'">
<Project>{c6530e81-d8d8-47a8-912e-d2939f801835}</Project>
<Name>Environment</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Json\Json.csproj">
<ProjectReference Include="..\..\src\Json\Json.csproj" Condition="'$(SkipJsonProj)' != 'true'">
<Project>{84e0ce5d-4af2-414f-a940-22b3f93fc727}</Project>
<Name>Json</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\UserSecrets\UserSecrets.csproj">
<ProjectReference Include="..\..\src\UserSecrets\UserSecrets.csproj" Condition="'$(SkipUserSecretsProj)' != 'true'">
<Project>{c60d6cbb-d513-4692-81a6-0be5d45e4702}</Project>
<Name>UserSecrets</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\KeyPerFile\KeyPerFile.csproj">
<ProjectReference Include="..\..\src\KeyPerFile\KeyPerFile.csproj" Condition="'$(SkipKeyPerFileProj)' != 'true'">
<Project>{60c31149-44ed-4789-b5c3-aaa5d3b2fcf1}</Project>
<Name>KeyPerFile</Name>
</ProjectReference>
Expand Down