Skip to content

Commit 86e94d7

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 9f05a3d commit 86e94d7

File tree

11 files changed

+44
-186
lines changed

11 files changed

+44
-186
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
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

18-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
19-
<PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
20-
</ItemGroup>
2118
</Project>

‎build/dependencies.props‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
4-
<AutoMapperVersion>5.0.2</AutoMapperVersion>
5-
<InternalAspNetCoreSdkVersion>2.0.1-rtm-15400</InternalAspNetCoreSdkVersion>
6-
<JsonNetVersion>10.0.1</JsonNetVersion>
7-
<NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
8-
<NETStandardLibraryNETFrameworkVersion>2.0.0</NETStandardLibraryNETFrameworkVersion>
9-
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0</RuntimeFrameworkVersion>
10-
<ThreadingDataflowVersion>4.8.0</ThreadingDataflowVersion>
3+
<InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion>
4+
<MicrosoftAspNetCoreDiagnosticsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreDiagnosticsPackageVersion>
5+
<MicrosoftAspNetCoreHostingAbstractionsPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingAbstractionsPackageVersion>
6+
<MicrosoftAspNetCoreHostingPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreHostingPackageVersion>
7+
<MicrosoftAspNetCoreMvcPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcPackageVersion>
8+
<MicrosoftAspNetCoreMvcTagHelpersPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcTagHelpersPackageVersion>
9+
<MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreMvcViewFeaturesPackageVersion>
10+
<MicrosoftAspNetCoreServerIISIntegrationPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
11+
<MicrosoftAspNetCoreServerKestrelPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreServerKestrelPackageVersion>
12+
<MicrosoftAspNetCoreStaticFilesPackageVersion>2.0.1-rtm-83</MicrosoftAspNetCoreStaticFilesPackageVersion>
13+
<MicrosoftExtensionsDependencyInjectionPackageVersion>2.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
14+
<MicrosoftExtensionsLoggingConsolePackageVersion>2.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
15+
<MicrosoftExtensionsLoggingDebugPackageVersion>2.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
16+
<NewtonsoftJsonRuntimePackageVersion>10.0.1</NewtonsoftJsonRuntimePackageVersion>
17+
<SystemThreadingTasksDataflowPackageVersion>4.8.0</SystemThreadingTasksDataflowPackageVersion>
1118
</PropertyGroup>
1219

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

‎build/dependencies.targets‎

Lines changed: 0 additions & 147 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>

‎samples/misc/LatencyTest/LatencyTest.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(AspNetCoreVersion)" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionPackageVersion)" />
1818
</ItemGroup>
1919

2020
</Project>

‎samples/misc/NodeServicesExamples/NodeServicesExamples.csproj‎

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

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

@@ -13,13 +13,13 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(AspNetCoreVersion)" />
17-
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
18-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(AspNetCoreVersion)" />
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(AspNetCoreVersion)" />
20-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(AspNetCoreVersion)" />
21-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(AspNetCoreVersion)" />
16+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="$(MicrosoftAspNetCoreDiagnosticsPackageVersion)" />
17+
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
18+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="$(MicrosoftAspNetCoreServerIISIntegrationPackageVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="$(MicrosoftAspNetCoreMvcPackageVersion)" />
20+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="$(MicrosoftAspNetCoreServerKestrelPackageVersion)" />
21+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="$(MicrosoftAspNetCoreStaticFilesPackageVersion)" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsLoggingDebugPackageVersion)" />
2323
</ItemGroup>
2424

2525
<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">

0 commit comments

Comments
 (0)