diff --git a/Directory.Build.props b/Directory.Build.props index 4eb0a65e92..80e6bb14f0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -90,11 +90,14 @@ aspnetcore-runtime aspnetcore-targeting-pack + + true + false - true + true + $(PackageId) + $(PackageId.Replace('.$(RuntimeIdentifier)','')) + $(PackagesInPatch.Contains(' $(PackageIdWithoutRID);')) @@ -70,6 +73,10 @@ false + + $(PackageVersion) + + $(BaselinePackageVersion.Substring(0, $(BaselinePackageVersion.IndexOf('-')))).0 @@ -83,6 +90,9 @@ --> $(BaselinePackageVersion) $(BaselinePackageVersion) + + + $(BaselinePackageVersion) diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 2e11857b1b..8e7bb0ecd5 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -82,12 +82,14 @@ and are generated based on the last package release. + + @@ -99,6 +101,7 @@ and are generated based on the last package release. + diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 5bc3a724cb..cc39ea0a52 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -5,6 +5,11 @@ This file contains a list of the package IDs which are patching in a given relea CAUTION: due to limitations in MSBuild, the format of the PackagesInPatch property is picky. When adding a new package, make sure the new line ends with a semicolon and starts with a space. +NOTE: Package IDs may be different from the project name. For example Microsoft.DotNet.Web.ProjectTemplates.csproj +Produces Microsoft.DotNet.Web.ProjectTemplates.$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) package. Also, +for the sake of simplicity, Microsoft.AspNetCore.App.Runtime.{RID} package IDs will be resolved as +Microsoft.AspNetCore.App.Runtime in this file; you do not need to append the RIDs when addint it to this file. + Directory.Build.props checks this property using the following condition: $(PackagesInPatch.Contains(' $(PackageId);')) --> @@ -25,6 +30,12 @@ Directory.Build.props checks this property using the following condition: Microsoft.AspNetCore.CookiePolicy; Microsoft.AspNetCore.HttpsPolicy; Microsoft.AspNetCore.AspNetCoreModuleV2; + Microsoft.AspNetCore.App.Ref; + Microsoft.AspNetCore.App.Runtime; + Microsoft.DotNet.Web.Client.ItemTemplates; + Microsoft.DotNet.Web.ItemTemplates; + Microsoft.DotNet.Web.ProjectTemplates.3.0; + Microsoft.DotNet.Web.Spa.ProjectTemplates.3.0; diff --git a/eng/Versions.props b/eng/Versions.props index 71199e7360..7fb19ff9b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -12,7 +12,7 @@ - false + true release true false @@ -37,7 +37,7 @@ $(VersionPrefix) - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0 + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).1 0.3.$(AspNetCorePatchVersion) $([MSBuild]::Add(10, $(AspNetCoreMajorVersion))) diff --git a/eng/targets/Packaging.targets b/eng/targets/Packaging.targets index fdef1de7a3..ea8dabdb46 100644 --- a/eng/targets/Packaging.targets +++ b/eng/targets/Packaging.targets @@ -13,7 +13,7 @@ <_ProjectPathWithVersion Include="$(MSBuildProjectFullPath)"> $(PackageId) - $(PackageVersion) + $(PackageVersionForPackageVersionInfo) $(VersionSuffix) $(PackageId.Replace('.',''))PackageVersion diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 340ceabe64..dfac85df6f 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -33,8 +33,10 @@ * preparing a new major or minor release (i.e. a non-servicing builds) * when a project is a test or sample project * when a package is releasing a new patch (we like to update external dependencies in patches when possible) + * the targeting pack is being patched --> true + true true true @@ -44,9 +46,11 @@ Projects should only use the project references instead of baseline package references when: * preparing a new major or minor release (i.e. a non-servicing builds) * when a project is a test or sample project + * the targeting pack is being patched We don't use project references between components in servicing builds between compontents to preserve the baseline as much as possible. --> true + true true false @@ -142,8 +146,8 @@ - - + + $(BuildDependsOn); - GeneratePackageConflictManifest; _ResolveTargetingPackContent; + GeneratePackageConflictManifest; IncludeFrameworkListFile; _BatchCopyToLayoutTargetDir; _InstallTargetingPackIntoLocalDotNet; @@ -110,15 +110,27 @@ This package is an internal implementation of the .NET Core SDK and is not meant + + + + + + + + + @@ -148,16 +160,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> + <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Internal.Extensions.Refs' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " /> + - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(NuGetPackageId)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" Condition="Exists('$(MicrosoftInternalExtensionsRefsPath)%(ReferencePath.NuGetPackageId).dll') AND '%(ReferencePath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(ReferencePath.NuGetSourceType)' == 'Package' " /> - <_AspNetCoreAppPackageOverrides Include="@(ReferencePath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(ReferencePath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(ReferencePath.IsReferenceAssembly)' == 'true' " /> + <_AspNetCoreAppPackageOverrides Include="@(_SelectedExtensionsRefAssemblies->'%(FileName)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" /> + + <_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(FileName)|$(ReferencePackSharedFxVersion)')" Condition=" '%(AspNetCoreReferenceAssemblyPath.ReferenceSourceTarget)' == 'ProjectReference' AND '%(AspNetCoreReferenceAssemblyPath.IsReferenceAssembly)' == 'true' " /> + Condition="'$(IsPackable)' == 'true' OR '$(IsTargetingPackPatching)' == 'true' "> <_TarCommand>tar <_TarCommand Condition="Exists('$(RepoRoot).tools\tar.exe')">$(RepoRoot).tools\tar.exe diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj index d227769965..90a77196ff 100644 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj @@ -56,6 +56,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant true $(SharedFxName).runtimeconfig.json + + true false diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj index eb4e1029c1..0f4df9e8ae 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj index aea732a885..d1b825a185 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj @@ -9,7 +9,7 @@ - +