diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 9078b33ac5..88323dff63 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -37,8 +37,6 @@ and are generated based on the last package release. - - @@ -49,6 +47,7 @@ and are generated based on the last package release. + @@ -66,8 +65,11 @@ and are generated based on the last package release. + + + @@ -84,6 +86,7 @@ and are generated based on the last package release. + @@ -93,9 +96,11 @@ and are generated based on the last package release. + + @@ -144,7 +149,9 @@ and are generated based on the last package release. + + diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 814b72900b..62207cf093 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -3,7 +3,8 @@ - + + $(RestoreSources); $(ArtifactsShippingPackagesDir); $(ArtifactsNonShippingPackagesDir) diff --git a/src/Framework/Microsoft.AspNetCore.App.props b/src/Framework/Microsoft.AspNetCore.App.props index 3ae3a637aa..23785af4df 100644 --- a/src/Framework/Microsoft.AspNetCore.App.props +++ b/src/Framework/Microsoft.AspNetCore.App.props @@ -85,8 +85,7 @@ - - + @@ -102,7 +101,6 @@ - @@ -129,14 +127,32 @@ - - - - - - - - + + + <_TransitiveExternalDependency Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" /> + <_TransitiveExternalDependency Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" /> + <_TransitiveExternalDependency Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" /> + <_TransitiveExternalDependency Include="System.IO.Pipelines" Version="$(SystemIOPipelinesPackageVersion)" /> + <_TransitiveExternalDependency Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafePackageVersion)" /> + <_TransitiveExternalDependency Include="System.Security.Cryptography.Pkcs" Version="$(SystemSecurityCryptographyPkcsPackageVersion)" /> + <_TransitiveExternalDependency Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlPackageVersion)" /> + <_TransitiveExternalDependency Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsPackageVersion)" /> + <_TransitiveExternalDependency Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebPackageVersion)" /> + <_TransitiveExternalDependency Include="System.Threading.Channels" Version="$(SystemThreadingChannelsPackageVersion)" /> + + + + + diff --git a/src/Framework/pkg/Metapackage.targets b/src/Framework/pkg/Metapackage.targets index 501dea9610..1e43373b9b 100644 --- a/src/Framework/pkg/Metapackage.targets +++ b/src/Framework/pkg/Metapackage.targets @@ -30,6 +30,7 @@ true + @@ -71,6 +72,7 @@ <_AspNetAppPackageConflictOverrides Include="@(Dependency->'%(Identity)|%(Version)')" Condition=" '%(Dependency.Version)' != '' " /> + <_AspNetAppPackageConflictOverrides Include="@(ExternalDependency->'%(Identity)|%(Version)')" Condition=" '%(ExternalDependency.Version)' != '' " /> diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 970727ba34..cc20b13165 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -2,6 +2,8 @@ true + + <_DisableRestoreFromLocalPackages>true @@ -37,7 +39,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + + diff --git a/src/Framework/src/SharedFx.targets b/src/Framework/src/SharedFx.targets index 4bf154064f..2f2d722635 100644 --- a/src/Framework/src/SharedFx.targets +++ b/src/Framework/src/SharedFx.targets @@ -139,6 +139,7 @@ This targets file should only be imported by .shfxproj files. true + Runtime;Native true diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index 2062dcb310..c2958edfac 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -41,7 +41,7 @@ <_Parameter1>SharedFxDependencies - <_Parameter2>@(Dependency);@(ExternalDependency) + <_Parameter2>@(Dependency);@(ExternalDependency);@(_TransitiveExternalDependency) <_Parameter1>MetadataOutputPath