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

Commit e45618e

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 6db92ec commit e45618e

File tree

21 files changed

+126
-239
lines changed

21 files changed

+126
-239
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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
19-
<PackageReference Include="NETStandard.Library" Version="$(NETStandardImplicitPackageVersion)" />
15+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkPackageVersion)" PrivateAssets="All" />
2016
</ItemGroup>
2117

2218
</Project>

‎build/dependencies.props‎

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,42 @@
11
<Project>
22
<PropertyGroup>
3-
<AspNetCoreVersion>2.0.0</AspNetCoreVersion>
4-
<BenchmarkDotNetVersion>0.10.3</BenchmarkDotNetVersion>
5-
<CoreFxVersion>4.4.0</CoreFxVersion>
6-
<DiagnosticSourceVersion>4.4.1</DiagnosticSourceVersion>
7-
<InternalAspNetCoreSdkVersion>2.0.1-rtm-15400</InternalAspNetCoreSdkVersion>
8-
<JsonNetVersion>10.0.1</JsonNetVersion>
3+
<BenchmarkDotNetPackageVersion>0.10.3</BenchmarkDotNetPackageVersion>
4+
<InternalAspNetCoreSdkPackageVersion>2.0.2-beta-15522</InternalAspNetCoreSdkPackageVersion>
5+
<MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>2.0.0</MicrosoftAspNetCoreHtmlAbstractionsPackageVersion>
6+
<MicrosoftAspNetCoreTestingPackageVersion>2.0.0</MicrosoftAspNetCoreTestingPackageVersion>
7+
<MicrosoftCodeAnalysisCommonPackageVersion>2.3.1</MicrosoftCodeAnalysisCommonPackageVersion>
8+
<MicrosoftCodeAnalysisCommonToolingPackageVersion>2.6.0-beta1-61924-08</MicrosoftCodeAnalysisCommonToolingPackageVersion>
9+
<MicrosoftCodeAnalysisCSharpPackageVersion>2.3.1</MicrosoftCodeAnalysisCSharpPackageVersion>
10+
<MicrosoftCodeAnalysisCSharpToolingPackageVersion>2.6.0-beta1-61924-08</MicrosoftCodeAnalysisCSharpToolingPackageVersion>
11+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.6.0-beta1-61924-08</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
12+
<MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>2.6.0-beta1-61924-08</MicrosoftCodeAnalysisRemoteRazorServiceHubPackageVersion>
13+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.3.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
14+
<MicrosoftCodeAnalysisWorkspacesCommonToolingPackageVersion>2.6.0-beta1-61924-08</MicrosoftCodeAnalysisWorkspacesCommonToolingPackageVersion>
15+
<MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>2.0.0</MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion>
916
<MicrosoftExtensionsDependencyModelPackageVersion>2.0.2-servicing-25728-02</MicrosoftExtensionsDependencyModelPackageVersion>
10-
<MoqVersion>4.7.49</MoqVersion>
11-
<NETStandardImplicitPackageVersion>2.0.0</NETStandardImplicitPackageVersion>
12-
<NETStandardLibraryNETFrameworkVersion>2.0.0</NETStandardLibraryNETFrameworkVersion>
13-
<RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0</RuntimeFrameworkVersion>
14-
<RoslynVersion>2.3.1</RoslynVersion>
15-
<RoslynDevVersion>2.6.0-beta1-61924-08</RoslynDevVersion>
16-
<StreamJsonRpcVersion>1.1.92</StreamJsonRpcVersion>
17-
<TestSdkVersion>15.3.0</TestSdkVersion>
18-
17+
<MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>2.0.0</MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion>
18+
<MicrosoftExtensionsWebEncodersPackageVersion>2.0.0</MicrosoftExtensionsWebEncodersPackageVersion>
19+
<MicrosoftNETTestSdkPackageVersion>15.3.0</MicrosoftNETTestSdkPackageVersion>
20+
<MicrosoftVisualStudioEditorPackageVersion>15.0.26606</MicrosoftVisualStudioEditorPackageVersion>
21+
<MicrosoftVisualStudioLanguageServicesPackageVersion>2.6.0-beta1-61924-08</MicrosoftVisualStudioLanguageServicesPackageVersion>
22+
<MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>2.6.0-beta1-61924-08</MicrosoftVisualStudioLanguageServicesRazorRemoteClientPackageVersion>
23+
<MicrosoftVisualStudioOLEInteropPackageVersion>7.10.6070</MicrosoftVisualStudioOLEInteropPackageVersion>
1924
<!-- Must keep in sync with tooling\Microsoft.VisualStudio.RazorExtension\project.json -->
20-
<VsShellVersion>15.0.26606</VsShellVersion>
21-
22-
<XunitVersion>2.3.0-beta2-build3683</XunitVersion>
23-
<XunitRunnerVisualStudioVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioVersion>
25+
<MicrosoftVisualStudioShell150PackageVersion>15.0.26606</MicrosoftVisualStudioShell150PackageVersion>
26+
<MicrosoftVisualStudioShellInterop100PackageVersion>10.0.30319</MicrosoftVisualStudioShellInterop100PackageVersion>
27+
<MicrosoftVisualStudioShellInterop110PackageVersion>11.0.61030</MicrosoftVisualStudioShellInterop110PackageVersion>
28+
<MicrosoftVisualStudioShellInterop120PackageVersion>12.0.30110</MicrosoftVisualStudioShellInterop120PackageVersion>
29+
<MicrosoftVisualStudioShellInterop80PackageVersion>8.0.50727</MicrosoftVisualStudioShellInterop80PackageVersion>
30+
<MicrosoftVisualStudioShellInterop90PackageVersion>9.0.30729</MicrosoftVisualStudioShellInterop90PackageVersion>
31+
<MicrosoftVisualStudioShellInteropPackageVersion>7.10.6071</MicrosoftVisualStudioShellInteropPackageVersion>
32+
<MoqPackageVersion>4.7.49</MoqPackageVersion>
33+
<NETStandardLibraryPackageVersion>2.0.0</NETStandardLibraryPackageVersion>
34+
<NewtonsoftJsonRuntimePackageVersion>10.0.1</NewtonsoftJsonRuntimePackageVersion>
35+
<NewtonsoftJsonToolingPackageVersion>9.0.1</NewtonsoftJsonToolingPackageVersion>
36+
<StreamJsonRpcPackageVersion>1.1.92</StreamJsonRpcPackageVersion>
37+
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.4.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
38+
<XunitPackageVersion>2.3.0-beta2-build3683</XunitPackageVersion>
39+
<XunitRunnerVisualStudioPackageVersion>2.3.0-beta2-build1317</XunitRunnerVisualStudioPackageVersion>
2440
</PropertyGroup>
2541

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

‎build/dependencies.targets‎

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

0 commit comments

Comments
 (0)