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

Commit 4d694d2

Browse files
author
John Beisner
committed
Second pass clean-up of package names; resequencing download.
1 parent f0abfb6 commit 4d694d2

File tree

9 files changed

+19
-14
lines changed

9 files changed

+19
-14
lines changed

‎build.proj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
<Target Name="RestoreDotnetCliBuildFramework"
3434
Inputs="$(DotnetCliBuildDirectory)/dotnet-cli-build.csproj"
3535
Outputs="@(RestoreDotnetCliBuildFrameworkOutputs)"
36-
DependsOnTargets="DownloadPackageVersionsProps;
37-
WriteNugetConfigFile">
36+
DependsOnTargets="WriteNugetConfigFile">
3837

3938
<PropertyGroup>
4039
<ExtraRestoreArgs>$(ExtraRestoreArgs) /p:GeneratePropsFile=$(GeneratePropsFile)</ExtraRestoreArgs>

‎build/DependencyVersions.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<MicrosoftNETCoreAppPackageVersion>2.0.3</MicrosoftNETCoreAppPackageVersion>
5+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
56
<MicrosoftBuildPackageVersion>15.4.8</MicrosoftBuildPackageVersion>
7+
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
8+
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
9+
<MicrosoftBuildLocalizationPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildLocalizationPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
611
<MicrosoftFSharpCompilerPackageVersion>4.2.0-rtm-171027-0</MicrosoftFSharpCompilerPackageVersion>
712
<MicrosoftCodeAnalysisCSharpPackageVersion>2.3.2-beta1-61921-05</MicrosoftCodeAnalysisCSharpPackageVersion>
813
<MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>

‎build/DownloadedPackageVersions.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project ToolsVersion="15.0">
2-
<Target Name="DownloadPackageVersionsProps">
2+
<Target Name="DownloadPackageVersionsProps"
3+
DependsOnTargets="BuildDotnetCliBuildFramework">
34

45
<DownloadFile Uri="$(PB_PackageVersionPropsUrl)$(CoreSetupBlobAccessTokenParam)"
56
DestinationPath="$(DownloadedPackageVersionsProps)"

‎build_projects/dotnet-cli-build/dotnet-cli-build.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
18+
<PackageReference Include="Microsoft.Build" Version="15.4.8" />
1919
<PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
2020
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
2121
<PackageReference Include="System.Reflection.Metadata" Version="1.4.1-beta-24410-02" />
2222
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
2323
<PackageReference Include="System.Xml.XmlSerializer" Version="4.0.11" />
2424
<PackageReference Include="WindowsAzure.Storage" Version="7.2.1" />
2525
<PackageReference Include="NuGet.CommandLine.XPlat" Version="$(CLI_NuGet_Version)" />
26-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
26+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.4.8" />
2727
<!-- This dependency was added due to an issue in restore where a lower version of this package coming from nuget.commandline.xplat
2828
led to an error. This is tracked as NuGet issue : https://github.com/NuGet/Home/issues/4213 -->
29-
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" />
30-
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
29+
<PackageReference Include="Microsoft.Build.Framework" Version="15.4.8" />
30+
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.DotNet.VersionTools" Version="$(VersionToolsVersion)" />
3232
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(BuildTasksFeedToolVersion)" />
3333
</ItemGroup>

‎src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<PackageReference Include="NuGet.Frameworks" Version="$(CLI_NuGet_Version)" />
2424
<PackageReference Include="NuGet.ProjectModel" Version="$(CLI_NuGet_Version)" />
2525
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildPackageVersion)" />
26-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildPackageVersion)" />
26+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
2727
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
2828
<PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
2929
</ItemGroup>

‎src/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildPackageVersion)" PrivateAssets="All" />
20-
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppPackageVersion)" PrivateAssets="All" />
20+
<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" PrivateAssets="All" />
2121
</ItemGroup>
2222

2323
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">

‎src/redist/redist.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
20-
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildPackageVersion)" />
20+
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
2121
<PackageReference Include="NuGet.Build.Tasks" Version="$(CLI_NuGet_Version)" />
2222
<PackageReference Include="Microsoft.TestPlatform.CLI" Version="$(CLI_TestPlatform_Version)" />
2323
<PackageReference Include="Microsoft.TestPlatform.Build" Version="$(CLI_TestPlatform_Version)" />

‎src/tool_msbuild/tool_msbuild.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NETCore.App" Version="$(MicrosoftNETCoreAppPackageVersion)" />
13-
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildPackageVersion)" />
14-
<PackageReference Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildPackageVersion)" />
13+
<PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
14+
<PackageReference Include="Microsoft.Build.Localization" Version="$(MicrosoftBuildLocalizationPackageVersion)" />
1515
</ItemGroup>
1616
</Project>

‎test/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
2323
<PackageReference Include="xunit" Version="2.2.0" />
24-
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppPackageVersion)" />
25-
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreAppPackageVersion)" />
24+
<PackageReference Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
25+
<PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

0 commit comments

Comments
 (0)