diff --git a/AspNetCore.slnx b/AspNetCore.slnx index 60f5ca0d74fc..6e083fe668c3 100644 --- a/AspNetCore.slnx +++ b/AspNetCore.slnx @@ -7,7 +7,6 @@ - diff --git a/Directory.Build.targets b/Directory.Build.targets index a2245ab43544..ae356cd2d0ed 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -53,8 +53,6 @@ '$(IsBenchmarkProject)' == 'true' OR '$(IsSampleProject)' == 'true' OR '$(IsMicrobenchmarksProject)' == 'true') ">false - - true @@ -73,24 +71,6 @@ $(PackageVersion) - - - $(BaselinePackageVersion.Substring(0, $(BaselinePackageVersion.IndexOf('-')))).0 - $(BaselinePackageVersion).0 - - $(BaselinePackageVersion) - $(BaselinePackageVersion) - - - $(BaselinePackageVersion) - - - -- -+ -+ - -``` - ## A darc cheatsheet `darc` is a command-line tool that is used for dependency management in the dotnet ecosystem of repos. `darc` can be installed using the `darc-init` scripts located inside the `eng/common` directory. Once `darc` is installed, you'll need to set up the appropriate access tokens as outlined [in the official Darc docs](https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#setting-up-your-darc-client). diff --git a/docs/UpdatingMajorVersionAndTFM.md b/docs/UpdatingMajorVersionAndTFM.md index 6fde9d8f98a8..29a872c11dec 100644 --- a/docs/UpdatingMajorVersionAndTFM.md +++ b/docs/UpdatingMajorVersionAndTFM.md @@ -21,7 +21,6 @@ Typically, we will update the Major Version before updating the TFM. This is bec * Mark APIs from the previous release as Shipped by running `.\eng\scripts\mark-shipped.cmd`. **Note that it's best to do this as early as possible after the API surface is finalized from the previous release** - make sure to be careful that any new API in `main` that isn't shipped as part of the previous release, stays in `PublicAPI.Unshipped.txt` files. * One way to ensure this is to check out the release branch shipping the previous release (**after API surface area has been finalized**), run `.\eng\scripts\mark-shipped.cmd` there, copy over all of the `PublicAPI.Unshipped.txt` and `PublicAPI.Shipped.txt` files into a new branch based off of `main`, and build the repo. Any failures there will tell you whether or not there are new APIs in main that need to be put back into the `PublicAPI.Unshipped.txt` files. * The result of `.\eng\scripts\mark-shipped.cmd` should be checked in to the release branch as well, as part of the RTM release. -* Update `.\eng\Baseline.xml` to reflect the set of RTM packages that were just shipped. Then, `dotnet run` `.\eng\tools\BaselineGenerator\BaselineGenerator.csproj`, which will update `.\eng\Baseline.Designer.props`. If RTM hasn't shipped yet, do this in a separate PR once it has. See https://github.com/dotnet/aspnetcore/pull/49269. * **In the new release branch**, add files named `.\eng\PlatformManifest.txt` and `.\eng\PackageOverrides.txt`. These files should be found by downloading the just released RTM version of the `Microsoft.AspNetCore.App.Ref` package, and copying over the files from the `data` folder. * Update [helix-matrix.yml](https://github.com/dotnet/aspnetcore/blob/436556163a671259c8b14ae1c90d72767af62d18/.azure/pipelines/helix-matrix.yml#L12-L16) to list the currently active release branches. * This should be done in `main` as well as the relevant release branch. diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props deleted file mode 100644 index 9488b25255ed..000000000000 --- a/eng/Baseline.Designer.props +++ /dev/null @@ -1,1003 +0,0 @@ - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - - - - - 10.0.0 - - - - - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - - 10.0.0 - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - - - - - - - - - - - - 10.0.0 - - - - 10.0.0 - - - - - - - 10.0.0 - - - - - \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml deleted file mode 100644 index f832230d7951..000000000000 --- a/eng/Baseline.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eng/Dependencies.props b/eng/Dependencies.props index d41269c96137..aa3a4b83dcb1 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -4,8 +4,6 @@ This file contains a list of all the external dependencies used in ASP.NET Core. are expressed as ``. These are used as inputs reference resolution, and may be turned into `` items in projects. -`` items should not be in this file. Those items appear in Baseline.Designer.props -and are generated based on the last package release. --> diff --git a/eng/Versions.props b/eng/Versions.props index aa7491a354b4..3bef4b5c4397 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,6 @@ 0 1 - false 8.0.1 *-* diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 18904a21cce9..1da321f435ff 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -10,8 +10,6 @@ Items used by the resolution strategy: - * BaselinePackageReference = a list of packages that were referenced in the last release of the project currently building - - mainly used to ensure references do not change in servicing builds unless $(UseLatestPackageReferences) is not true. * LatestPackageReference = a list of the latest versions of packages * Reference = a list of the references which are needed for compilation or runtime * ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it @@ -46,7 +44,7 @@ Condition=" '$(UseLatestPackageReferences)' == '' AND '$(IsPackageInThisPatch)' == 'true' ">true false - + true @@ -142,18 +140,6 @@ ContentFiles;Build All - - - - - - - - - - - - - - - - - - - - <_LatestPackageReferenceWithVersion Remove="@(_LatestPackageReferenceWithVersion)" /> - <_BaselinePackageReferenceWithVersion Remove="@(_BaselinePackageReferenceWithVersion)" /> <_PrivatePackageReferenceWithVersion Remove="@(_PrivatePackageReferenceWithVersion)" /> <_ImplicitPackageReference Remove="@(_ImplicitPackageReference)" /> @@ -207,15 +180,10 @@ <_ExplicitPackageReference Remove="@(_ExplicitPackageReference)" /> - - + Text="Could not resolve this reference. Could not locate the package or project for "%(Reference.Identity)". Did you update dependencies lists? See docs/ReferenceResolution.md for more details." /> - - - - -