diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-11-22 23:57:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-22 23:57:34 +0300 |
| commit | 30eec7d2ae99ad86cfd9fca8759bac0214de7b12 (patch) | |
| tree | 7e2e1ad027a92dda84e0fa3d1d229bbcc10c25a7 | |
| parent | 64d3a351a192a9d817a0a6a489a0e78acddaf1dd (diff) | |
| parent | aa18287132fac9920e9f1cee63782d26ff350362 (diff) | |
Merge pull request #17238 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2v2.2.9
[automated] Merge branch 'release/2.1' => 'release/2.2'
| -rw-r--r-- | eng/PatchConfig.props | 4 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt | 1 | ||||
| -rw-r--r-- | src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 47b5678703..e7f03d5fa3 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -83,4 +83,8 @@ Later on, this will be checked using this condition: Microsoft.AspNetCore.DataProtection.EntityFrameworkCore; </PackagesInPatch> </PropertyGroup> + <PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.15' "> + <PackagesInPatch> + </PackagesInPatch> + </PropertyGroup> </Project> diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.14.txt @@ -0,0 +1 @@ + diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.14.txt @@ -0,0 +1 @@ + |