Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 4afe448

Browse files
author
Nate McMaster
committed
Update how PackageReference versions are set
Changes: - Remove floating versions - Disable myget feeds during a Universe build - Use package-specific MSBuild variables. Pattern = `packageId.Pascalize() + "PackageVersion"`, with a few exceptions.
1 parent dfe3639 commit 4afe448

File tree

20 files changed

+71
-204
lines changed

20 files changed

+71
-204
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
<Project>
1+
<Project>
22
<Import Project="build\sources.props" />
33
<Import Project="build\dependencies.props" />
4-
<Import Project="build\dependencies.targets" />
5-
<Import Project="build\dependencies.g.targets" Condition="Exists('build\dependencies.g.targets') AND '$(DesignTimeBuild)' != 'true'" />
64
</Project>

‎build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
15+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" PrivateAssets="All" />
1616
</ItemGroup>
1717
</Project>

‎build/dependencies.props

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
4-
<CoreFxVersion>4.4.0</CoreFxVersion>
5-
<InternalAspNetCoreSdkVersion>2.0.1-rtm-15400</InternalAspNetCoreSdkVersion>
6-
<NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
7-
<NETStandardLibraryNETFrameworkVersion>2.0.0</NETStandardLibraryNETFrameworkVersion>
8-
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0</RuntimeFrameworkVersion>
9-
<TestSdkVersion>15.3.0</TestSdkVersion>
10-
<XunitVersion>2.3.0-beta2-build3683</XunitVersion>
11-
<XunitRunnerVisualStudioVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioVersion>
3+
<InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion>
4+
<MicrosoftAspNetCoreTestingPackageVersion>2.0.0</MicrosoftAspNetCoreTestingPackageVersion>
5+
<MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>2.0.0</MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion>
6+
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.0.0</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
7+
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
8+
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>2.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
9+
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>2.0.0</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
10+
<MicrosoftExtensionsObjectPoolPackageVersion>2.0.0</MicrosoftExtensionsObjectPoolPackageVersion>
11+
<MicrosoftExtensionsOptionsPackageVersion>2.0.0</MicrosoftExtensionsOptionsPackageVersion>
12+
<MicrosoftExtensionsPrimitivesPackageVersion>2.0.0</MicrosoftExtensionsPrimitivesPackageVersion>
13+
<MicrosoftExtensionsWebEncodersSourcesPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersSourcesPackageVersion>
14+
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
15+
<SystemBuffersPackageVersion>4.4.0</SystemBuffersPackageVersion>
16+
<SystemTextEncodingsWebPackageVersion>4.4.0</SystemTextEncodingsWebPackageVersion>
17+
<XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion>
18+
<XunitRunnerVisualStudioPackageVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioPackageVersion>
1219
</PropertyGroup>
1320

1421
<Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />

‎build/dependencies.targets

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

‎build/sources.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33

44
<PropertyGroup>
55
<RestoreSources>$(DotNetRestoreSources)</RestoreSources>
6-
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
6+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND '$(AspNetUniverseBuildOffline)' != 'true' ">
77
$(RestoreSources);
88
https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch/api/v3/index.json;
99
https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json;
1010
https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json;
11+
</RestoreSources>
12+
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
13+
$(RestoreSources);
1114
https://api.nuget.org/v3/index.json;
1215
</RestoreSources>
1316
</PropertyGroup>

‎src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
44
<Description>ASP.NET Core common types used by the various authentication components.</Description>
@@ -14,8 +14,8 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
18-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsPackageVersion)" />
18+
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftExtensionsOptionsPackageVersion)" />
1919
</ItemGroup>
2020

21-
</Project>
21+
</Project>

‎src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
25-
<PackageReference Include="System.Text.Encodings.Web" Version="$(CoreFxVersion)" />
24+
<PackageReference Include="Microsoft.Extensions.ActivatorUtilities.Sources" Version="$(MicrosoftExtensionsActivatorUtilitiesSourcesPackageVersion)" PrivateAssets="All" />
25+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" />
2626
</ItemGroup>
2727

2828
</Project>

‎src/Microsoft.AspNetCore.Http.Extensions/Microsoft.AspNetCore.Http.Extensions.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="..\..\build\common.props" />
44

@@ -16,8 +16,8 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
20+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersPackageVersion)" />
2121
</ItemGroup>
2222

2323
</Project>

‎src/Microsoft.AspNetCore.Http.Features/Microsoft.AspNetCore.Http.Features.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="..\..\build\common.props" />
44

@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(AspNetCoreVersion)" />
14+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(MicrosoftExtensionsPrimitivesPackageVersion)" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)