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

Use Version suffix and clean versions #8724

Merged
ViktorHofer merged 6 commits into from
Nov 1, 2019
Merged

Use Version suffix and clean versions #8724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d5e022
Use PackageVersion suffix and clean versions
ViktorHofer Oct 31, 2019
321c611
Update SharedFramework.Sdk
ViktorHofer Nov 1, 2019
52626a2
Merge branch 'master' into CleanBARVersions
ViktorHofer Nov 1, 2019
0e277b1
Update Version.Details.xml
ViktorHofer Nov 1, 2019
75e59b4
Update Versions.props
ViktorHofer Nov 1, 2019
caef15e
Update global.json
ViktorHofer Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
<!-- source-built packages -->
<ItemGroup>
<!-- arcade -->
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
</ItemGroup>

<!-- excluded from source build -->
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
<PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />

<!-- SourceLink -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
Expand Down
85 changes: 0 additions & 85 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,78 +13,6 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="Microsoft.Windows.Compatibility" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.IO.FileSystem.AccessControl" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
Expand All @@ -93,14 +21,6 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Threading.AccessControl" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha.1.19551.1">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>dd2ad4367bc4e070f3e8ca81ca6421db5733e731</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.2.0-prerelease.19551.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>1063b6811691a2e009d7733cbf68f897511f00b2</Sha>
Expand Down Expand Up @@ -135,10 +55,5 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>db50c8d7378a7a81033a1b8fcfa5461694a891c3</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink" Version="1.0.0-beta2-19367-01">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
75 changes: 21 additions & 54 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,83 +19,50 @@
<NETCoreAppFrameworkVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>netcoreapp$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotNetMaestroTasksVersion>1.0.0-beta.18619.4</MicrosoftDotNetMaestroTasksVersion>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
<!-- arcade -->
<MicrosoftDotNetBuildTasksFeedPackageVersion>5.0.0-beta.19531.14</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>5.0.0-beta.19531.14</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>5.0.0-beta.19531.14</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.19531.14</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.19531.14</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.19531.14</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.19531.14</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.19531.14</MicrosoftDotNetXUnitExtensionsVersion>
<!-- Testing -->
<XUnitPackageVersion>2.4.1</XUnitPackageVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<!-- core-setup -->
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.0.0</MicrosoftDotNetPlatformAbstractionsPackageVersion>
<!-- sourcelink -->
<MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftDotNetPlatformAbstractionsVersion>3.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
<!-- corefx -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCoreTargetsPackageVersion>
<MicrosoftPrivateCoreFxNETCoreAppPackageVersion>5.0.0-alpha.1.19551.1</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
<MicrosoftWin32RegistryVersion>5.0.0-alpha.1.19551.1</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>5.0.0-alpha.1.19551.1</MicrosoftWin32SystemEventsVersion>
<MicrosoftWindowsCompatibilityPackageVersion>5.0.0-alpha.1.19551.1</MicrosoftWindowsCompatibilityPackageVersion>
<SystemCodeDomVersion>5.0.0-alpha.1.19551.1</SystemCodeDomVersion>
<SystemConfigurationConfigurationManagerVersion>5.0.0-alpha.1.19551.1</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsEventLogVersion>5.0.0-alpha.1.19551.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesVersion>5.0.0-alpha.1.19551.1</SystemDirectoryServicesVersion>
<SystemDrawingCommonVersion>5.0.0-alpha.1.19551.1</SystemDrawingCommonVersion>
<SystemIOFileSystemAccessControlVersion>5.0.0-alpha.1.19551.1</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>5.0.0-alpha.1.19551.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsPackageVersion>5.0.0-alpha.1.19551.1</SystemResourcesExtensionsPackageVersion>
<SystemSecurityAccessControlVersion>5.0.0-alpha.1.19551.1</SystemSecurityAccessControlVersion>
<SystemSecurityCryptographyCngVersion>5.0.0-alpha.1.19551.1</SystemSecurityCryptographyCngVersion>
<SystemSecurityCryptographyPkcsVersion>5.0.0-alpha.1.19551.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyProtectedDataVersion>5.0.0-alpha.1.19551.1</SystemSecurityCryptographyProtectedDataVersion>
<SystemSecurityCryptographyXmlVersion>5.0.0-alpha.1.19551.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>5.0.0-alpha.1.19551.1</SystemSecurityPermissionsVersion>
<SystemSecurityPrincipalWindowsVersion>5.0.0-alpha.1.19551.1</SystemSecurityPrincipalWindowsVersion>
<MicrosoftNETCorePlatformsVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCoreTargetsVersion>5.0.0-alpha.1.19551.1</MicrosoftNETCoreTargetsVersion>
<MicrosoftPrivateCoreFxNETCoreAppVersion>5.0.0-alpha.1.19551.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
<SystemTextJsonVersion>5.0.0-alpha.1.19551.1</SystemTextJsonVersion>
<SystemTextEncodingsWebVersion>5.0.0-alpha.1.19551.1</SystemTextEncodingsWebVersion>
<SystemThreadingAccessControlVersion>5.0.0-alpha.1.19551.1</SystemThreadingAccessControlVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-alpha.1.19551.1</SystemWindowsExtensionsPackageVersion>
<!-- standard -->
<NETStandardLibraryPackageVersion>2.2.0-prerelease.19551.1</NETStandardLibraryPackageVersion>
<NETStandardLibraryVersion>2.2.0-prerelease.19551.1</NETStandardLibraryVersion>
<!-- coreclr -->
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsPackageVersion>5.0.0-alpha1.19480.6</MicrosoftPrivateWinformsPackageVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubPackageVersion>5.0.0-alpha1.19501.4</MicrosoftDotNetWpfGitHubPackageVersion>
<!-- wpf-int -->
<MicrosoftDotNetWpfDncEngPackageVersion>5.0.0-alpha1.19501.17</MicrosoftDotNetWpfDncEngPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19525.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftTargetingPackPrivateWinRTPackageVersion>1.0.5</MicrosoftTargetingPackPrivateWinRTPackageVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftTargetingPackPrivateWinRTVersion>1.0.5</MicrosoftTargetingPackPrivateWinRTVersion>
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
<!--
These are used as reference assemblies only, so they must not take a ProdCon/source-build
version. Insert "RefOnly" to avoid assignment via PVP.
-->
<RefOnlyMicrosoftBuildPackageVersion>15.7.179</RefOnlyMicrosoftBuildPackageVersion>
<RefOnlyMicrosoftBuildFrameworkPackageVersion>$(RefOnlyMicrosoftBuildPackageVersion)</RefOnlyMicrosoftBuildFrameworkPackageVersion>
<RefOnlyMicrosoftBuildTasksCorePackageVersion>$(RefOnlyMicrosoftBuildPackageVersion)</RefOnlyMicrosoftBuildTasksCorePackageVersion>
<RefOnlyMicrosoftBuildUtilitiesCorePackageVersion>$(RefOnlyMicrosoftBuildPackageVersion)</RefOnlyMicrosoftBuildUtilitiesCorePackageVersion>
<RefOnlyNugetProjectModelPackageVersion>4.9.4</RefOnlyNugetProjectModelPackageVersion>
<RefOnlyNugetPackagingPackageVersion>4.9.4</RefOnlyNugetPackagingPackageVersion>
<RefOnlyMicrosoftBuildVersion>15.7.179</RefOnlyMicrosoftBuildVersion>
<RefOnlyMicrosoftBuildFrameworkVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildFrameworkVersion>
<RefOnlyMicrosoftBuildTasksCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildTasksCoreVersion>
<RefOnlyMicrosoftBuildUtilitiesCoreVersion>$(RefOnlyMicrosoftBuildVersion)</RefOnlyMicrosoftBuildUtilitiesCoreVersion>
<RefOnlyNugetProjectModelVersion>4.9.4</RefOnlyNugetProjectModelVersion>
<RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion>
</PropertyGroup>
<!--Package names-->
<PropertyGroup>
<MicrosoftDotNetBuildTasksFeedPackage>Microsoft.DotNet.Build.Tasks.Feed</MicrosoftDotNetBuildTasksFeedPackage>
<MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage>
<MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage>
<MicrosoftNETCoreTargetsPackage>Microsoft.NETCore.Targets</MicrosoftNETCoreTargetsPackage>
<NETStandardLibraryPackage>NETStandard.Library</NETStandardLibraryPackage>
<NETStandardLibraryPackage>netstandard.library</NETStandardLibraryPackage>
<MicrosoftNETCoreRuntimeCoreCLRPackage>Microsoft.NETCore.Runtime.CoreCLR</MicrosoftNETCoreRuntimeCoreCLRPackage>
<MicrosoftBclJsonSourcesPackage>Microsoft.Bcl.Json.Sources</MicrosoftBclJsonSourcesPackage>
<MicrosoftTargetingPackPrivateWinRTPackage>Microsoft.TargetingPack.Private.WinRT</MicrosoftTargetingPackPrivateWinRTPackage>
<MicrosoftSymbolUploaderBuildTaskPackage>Microsoft.SymbolUploader.Build.Task</MicrosoftSymbolUploaderBuildTaskPackage>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dotnet": "3.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19531.14",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19531.14"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19551.2",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.19551.2"
}
}
2 changes: 1 addition & 1 deletion src/pkg/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />

<PropertyGroup>
<RuntimeIdGraphDefinitionFile>$(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsPackageVersion)\runtime.json</RuntimeIdGraphDefinitionFile>
<RuntimeIdGraphDefinitionFile>$(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsVersion)\runtime.json</RuntimeIdGraphDefinitionFile>
</PropertyGroup>

<!--
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/deps/deps.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<PackageReference Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/pkg/projects/netcoreapp/pkg/workaround/Microsoft.NETCore.App.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</PropertyGroup>

<ItemGroup>
<Dependency Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<Dependency Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
8 changes: 4 additions & 4 deletions src/pkg/projects/netcoreapp/src/localnetcoreapp.override.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<CoreFXSharedFrameworkImplementationPackageSpec Condition="'$(PackageRID)' != ''">$(CoreFXOverridePath)/specs/runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage).nuspec</CoreFXSharedFrameworkImplementationPackageSpec>
</PropertyGroup>

<Error Condition="!Exists('$(CoreFXSharedFrameworkPackageSpec)')" Text="The nuspec for the reference Microsoft.Private.CoreFx.NETCoreApp package does not exist." />
<Error Condition="!Exists('$(CoreFXSharedFrameworkPackageSpec)')" Text="The nuspec for the reference $(MicrosoftPrivateCoreFxNETCoreAppPackage) package does not exist." />
<Message Condition="'$(CoreFXSharedFrameworkImplementationPackageSpec)' != '' And !Exists('$(CoreFXSharedFrameworkImplementationPackageSpec)')"
Text="The nuspec for the implementation runtime.$(PackageRID).Microsoft.Private.CoreFx.NETCoreApp package does not exist. Falling back to packaged CoreFX." />
Text="The nuspec for the implementation runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage) package does not exist. Falling back to packaged CoreFX." />

<XmlPeek
Namespaces="&lt;Namespace Prefix='nuget' Uri='http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd' /&gt;"
Expand All @@ -65,8 +65,8 @@
</XmlPeek>

<ItemGroup>
<CoreFXReferenceItems NuGetPackageId="Microsoft.Private.CoreFx.NETCoreApp" />
<CoreFXReferenceCopyLocalItems NuGetPackageId="runtime.$(PackageRID).Microsoft.Private.CoreFx.NETCoreApp" />
<CoreFXReferenceItems NuGetPackageId="$(MicrosoftPrivateCoreFxNETCoreAppPackage)" />
<CoreFXReferenceCopyLocalItems NuGetPackageId="runtime.$(PackageRID).$(MicrosoftPrivateCoreFxNETCoreAppPackage)" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions src/pkg/projects/netcoreapp/src/netcoreapp.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp" Version="$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)" />
<PackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
<PackageReference Include="Microsoft.NETCore.Targets" Version="$(MicrosoftNETCoreTargetsPackageVersion)" />
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryPackageVersion)" />
<PackageReference Include="$(MicrosoftPrivateCoreFxNETCoreAppPackage)" Version="$(MicrosoftPrivateCoreFxNETCoreAppVersion)" />
<PackageReference Include="transport.$(MicrosoftNETCoreRuntimeCoreCLRPackage)" Version="$(MicrosoftNETCoreRuntimeCoreCLRVersion)" />
<PackageReference Include="$(MicrosoftNETCorePlatformsPackage)" Version="$(MicrosoftNETCorePlatformsVersion)" />
<PackageReference Include="$(MicrosoftNETCoreTargetsPackage)" Version="$(MicrosoftNETCoreTargetsVersion)" />
<PackageReference Include="$(NETStandardLibraryPackage)" Version="$(NETStandardLibraryVersion)" />
</ItemGroup>

<!-- This tool is a prebuilt not buildable from source. -->
<ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativePackageVersion)" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
Expand Down
Loading