Skip to content

Commit 3579e8f

Browse files
Build fixes (#110)
* Allow nuget restore to be skipped in build pipeline. * Update nuget config. * Update nuget.exe * Allow pipeline to build select packages instead of all of them every time.
1 parent 8702227 commit 3579e8f

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

.nuget/NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<add key="disableSourceControlIntegration" value="true" />
55
</solution>
66
<packageSources>
7-
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
7+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
88
</packageSources>
99
</configuration>

.nuget/NuGet.exe

5.52 MB
Binary file not shown.

MicrosoftConfigurationBuilders.msbuild

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
<ItemGroup>
44
<AssemblyProject Include="src\Base\Base.csproj" />
5-
<AssemblyProject Include="src\Environment\Environment.csproj" />
6-
<AssemblyProject Include="src\UserSecrets\UserSecrets.csproj" />
7-
<AssemblyProject Include="src\Azure\Azure.csproj" />
8-
<AssemblyProject Include="src\Json\Json.csproj" />
9-
<AssemblyProject Include="src\AzureAppConfig\AzureAppConfig.csproj" />
5+
<AssemblyProject Include="src\Environment\Environment.csproj" Condition="'$(SkipEnvironmentProj)' != 'true'" />
6+
<AssemblyProject Include="src\UserSecrets\UserSecrets.csproj" Condition="'$(SkipUserSecretsProj)' != 'true'" />
7+
<AssemblyProject Include="src\KeyPerFile\KeyPerFile.csproj" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
8+
<AssemblyProject Include="src\Azure\Azure.csproj" Condition="'$(SkipAzureProj)' != 'true'" />
9+
<AssemblyProject Include="src\Json\Json.csproj" Condition="'$(SkipJsonProj)' != 'true'" />
10+
<AssemblyProject Include="src\AzureAppConfig\AzureAppConfig.csproj" Condition="'$(SkipAzureAppConfigProj)' != 'true'" />
1011
</ItemGroup>
1112

1213
<ItemGroup>
@@ -62,7 +63,7 @@
6263

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

65-
<Target Name="RestorePackages">
66+
<Target Name="RestorePackages" Condition="'$(SkipPackageRestore)' != 'true'">
6667
<Exec Command=".nuget\NuGet.exe restore" />
6768
</Target>
6869

src/packages/packages.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
</PropertyGroup>
2525
<ItemGroup Label="Nuget Project Build Order">
2626
<NuGetProject Include="ConfigurationBuilders.Base.nupkg\Microsoft.Configuration.ConfigurationBuilders.Base.nuproj" />
27-
<NuGetProject Include="ConfigurationBuilders.Environment.nupkg\Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj" />
28-
<NuGetProject Include="ConfigurationBuilders.UserSecrets.nupkg\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj" />
29-
<NuGetProject Include="ConfigurationBuilders.KeyPerFile.nupkg\Microsoft.Configuration.ConfigurationBuilders.KeyPerFile.nuproj" />
30-
<NuGetProject Include="ConfigurationBuilders.Azure.nupkg\Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj" />
31-
<NuGetProject Include="ConfigurationBuilders.Json.nupkg\Microsoft.Configuration.ConfigurationBuilders.Json.nuproj" />
32-
<NuGetProject Include="ConfigurationBuilders.AzureAppConfiguration.nupkg\Microsoft.Configuration.ConfigurationBuilders.AzureAppConfiguration.nuproj" />
27+
<NuGetProject Include="ConfigurationBuilders.Environment.nupkg\Microsoft.Configuration.ConfigurationBuilders.Environment.nuproj" Condition="'$(SkipEnvironmentProj)' != 'true'" />
28+
<NuGetProject Include="ConfigurationBuilders.UserSecrets.nupkg\Microsoft.Configuration.ConfigurationBuilders.UserSecrets.nuproj" Condition="'$(SkipUserSecretsProj)' != 'true'" />
29+
<NuGetProject Include="ConfigurationBuilders.KeyPerFile.nupkg\Microsoft.Configuration.ConfigurationBuilders.KeyPerFile.nuproj" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
30+
<NuGetProject Include="ConfigurationBuilders.Azure.nupkg\Microsoft.Configuration.ConfigurationBuilders.Azure.nuproj" Condition="'$(SkipAzureProj)' != 'true'" />
31+
<NuGetProject Include="ConfigurationBuilders.Json.nupkg\Microsoft.Configuration.ConfigurationBuilders.Json.nuproj" Condition="'$(SkipJsonProj)' != 'true'" />
32+
<NuGetProject Include="ConfigurationBuilders.AzureAppConfiguration.nupkg\Microsoft.Configuration.ConfigurationBuilders.AzureAppConfiguration.nuproj" Condition="'$(SkipAzureAppConfigProj)' != 'true'" />
3333
</ItemGroup>
3434
<ItemGroup Label="Base">
3535
<None Include="ConfigurationBuilders.Base.nupkg\Microsoft.Configuration.ConfigurationBuilders.Base.nuspec" />

test/Microsoft.Configuration.ConfigurationBuilders.Test/Test.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,32 +45,32 @@
4545
</ItemGroup>
4646
<ItemGroup>
4747
<Compile Include="CommonBuilderTests.cs" />
48-
<Compile Include="UserSecretsTests.cs" />
49-
<Compile Include="KeyPerFileTests.cs" />
50-
<Compile Include="SimpleJsonTests.cs" />
48+
<Compile Include="UserSecretsTests.cs" Condition="'$(SkipUserSecretsProj)' != 'true'" />
49+
<Compile Include="KeyPerFileTests.cs" Condition="'$(SkipKeyPerFileProj)' != 'true'" />
50+
<Compile Include="SimpleJsonTests.cs" Condition="'$(SkipJsonProj)' != 'true'" />
5151
<Compile Include="UtilsTests.cs" />
5252
<Compile Include="BaseTests.cs" />
53-
<Compile Include="EnvironmentTests.cs" />
53+
<Compile Include="EnvironmentTests.cs" Condition="'$(SkipEnvironmentProj)' != 'true'" />
5454
<Compile Include="Properties\AssemblyInfo.cs" />
5555
</ItemGroup>
5656
<ItemGroup>
5757
<ProjectReference Include="..\..\src\Base\Base.csproj">
5858
<Project>{f382fbf8-146d-4968-a199-90d37f9ef9a7}</Project>
5959
<Name>Base</Name>
6060
</ProjectReference>
61-
<ProjectReference Include="..\..\src\Environment\Environment.csproj">
61+
<ProjectReference Include="..\..\src\Environment\Environment.csproj" Condition="'$(SkipEnvironmentProj)' != 'true'">
6262
<Project>{c6530e81-d8d8-47a8-912e-d2939f801835}</Project>
6363
<Name>Environment</Name>
6464
</ProjectReference>
65-
<ProjectReference Include="..\..\src\Json\Json.csproj">
65+
<ProjectReference Include="..\..\src\Json\Json.csproj" Condition="'$(SkipJsonProj)' != 'true'">
6666
<Project>{84e0ce5d-4af2-414f-a940-22b3f93fc727}</Project>
6767
<Name>Json</Name>
6868
</ProjectReference>
69-
<ProjectReference Include="..\..\src\UserSecrets\UserSecrets.csproj">
69+
<ProjectReference Include="..\..\src\UserSecrets\UserSecrets.csproj" Condition="'$(SkipUserSecretsProj)' != 'true'">
7070
<Project>{c60d6cbb-d513-4692-81a6-0be5d45e4702}</Project>
7171
<Name>UserSecrets</Name>
7272
</ProjectReference>
73-
<ProjectReference Include="..\..\src\KeyPerFile\KeyPerFile.csproj">
73+
<ProjectReference Include="..\..\src\KeyPerFile\KeyPerFile.csproj" Condition="'$(SkipKeyPerFileProj)' != 'true'">
7474
<Project>{60c31149-44ed-4789-b5c3-aaa5d3b2fcf1}</Project>
7575
<Name>KeyPerFile</Name>
7676
</ProjectReference>

0 commit comments

Comments
 (0)