From 7f7723bdf254ae3b85df50fbb34b1279b1b6db7d Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 14 Jan 2019 12:01:31 -0800 Subject: [PATCH] Consume dependencies updates automatically via darc (#6676) This refactors the list of dependency versions to support consuming updates automatically via darc and maestro. --- .gitignore | 1 + Directory.Build.targets | 3 +- build/dependencies.folderbuilds.props | 7 - build/dependencies.props | 226 ----------- build/external-dependencies.props | 164 +------- build/repo.targets | 5 - build/tasks/RepoTasks.csproj | 4 +- eng/Dependencies.props | 20 +- eng/Version.Details.xml | 367 ++++++++++++++++++ eng/Versions.props | 177 ++++++++- src/AuthSamples/build/dependencies.props | 25 +- src/Framework/Directory.Build.props | 12 +- .../benchmarkapps/BasicApi/BasicApi.csproj | 12 +- .../BasicViews/BasicViews.csproj | 12 +- .../GetDocumentInsider.csproj | 3 +- ...kwardsCompatibility.FunctionalTests.csproj | 5 +- .../InProcessWebSite.csproj | 6 +- .../LoggingAggregate/build/dependencies.props | 2 +- src/Templating/Directory.Build.targets | 2 +- src/Templating/build/dependencies.props | 3 +- src/Templating/build/repo.props | 2 +- ...crosoft.DotNet.Web.ProjectTemplates.csproj | 2 +- 22 files changed, 593 insertions(+), 467 deletions(-) delete mode 100644 build/dependencies.folderbuilds.props delete mode 100644 build/dependencies.props create mode 100644 eng/Version.Details.xml diff --git a/.gitignore b/.gitignore index 529b82739e5..469825be569 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ BenchmarkDotNet.Artifacts/ korebuild-lock.txt .gradle/ src/SignalR/clients/**/dist/ +modules/ diff --git a/Directory.Build.targets b/Directory.Build.targets index c8927ff3fb0..de6e19d8e21 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -61,8 +61,7 @@ true false - $(MicrosoftNETCoreApp30PackageVersion) - $(NETStandardLibrary20PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) diff --git a/build/dependencies.folderbuilds.props b/build/dependencies.folderbuilds.props deleted file mode 100644 index 232b7ab42a9..00000000000 --- a/build/dependencies.folderbuilds.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - 3.0.0-build-20181214.1 - 3.0.0-preview-18606-0098 - - diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 51176ee3b51..00000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,226 +0,0 @@ - - - - - 3.0.0-preview-27219-3 - 3.0.0-preview-27219-3 - 3.0.0-preview-27219-3 - 3.0.0-preview-27219-3 - $(MicrosoftNETCoreAppPackageVersion) - - - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 1.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.7.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.5.2 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 1.7.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.6.0-preview.18619.1 - 4.10.0-preview.18619.1 - 4.6.0-preview.18619.1 - - - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - 3.0.0-preview.19059.4 - - - - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - 3.0.0-preview.18604.3 - - - 3.0.0-preview-19057-06 - - - - - - - - $(KoreBuildVersion) - $(KoreBuildVersion) - 3.0.0-build-20190110.4 - - - - - - 0.9.9 - 0.10.13 - - - 2.1.1 - 2.1.1 - 2.1.1 - 0.43.0 - 2.1.1.1 - 2.1.1 - - 4.2.1 - 2.1.0 - 8.7.0 - 4.2.1 - 2.3.0 - 2.3.0 - 2.3.0 - 3.1.0 - 1.10.0 - 1.7.3.4 - 2.1.1 - 2.2.0 - 2.2.0 - 2.0.0 - 2.2.1 - 2.2.0 - 5.2.6 - 2.3.2 - 1.1.3 - 1.0.3 - 15.8.166 - 15.8.166 - 15.8.166 - 15.8.166 - 15.8.166 - 2.8.0 - 2.8.0 - 2.8.0 - 1.7.0 - 1.0.0-rc3-003121 - 1.1.0 - 3.19.8 - 5.3.0 - 5.3.0 - 5.3.0 - 5.3.0 - 5.3.0 - 5.3.0 - 2.1.1 - 1.0.1 - 1.0.0-alpha-004 - 15.9.0 - 3.0.1 - 3.0.1 - 3.0.1 - 11.1.0 - 1.4.0 - 1.3.8 - 1.0.1 - 4.10.0 - 1.6.1 - 2.0.3 - 1.0.2 - 12.0.1 - 0.20.0 - 3.12.1 - 2.43.0 - 17.17134.0 - 3.12.1 - 1.4.0 - 4.0.0 - 2.0.513 - 1.3.23 - 1.0.0 - 4.5.0 - 5.3.0 - 4.3.2 - 3.1.1 - 4.3.0 - 4.3.0 - 4.5.0 - 1.3.7 - 9.0.1 - 8.1.4 - 2.0.1 - 0.10.0 - 2.3.1 - 2.3.1 - 2.3.1 - 2.3.1 - 2.4.0 - 2.4.0 - - diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 499c5a029b9..494ba861dbc 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -1,5 +1,5 @@ - + @@ -10,27 +10,14 @@ - - - - - - - - - - - - - @@ -38,177 +25,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/repo.targets b/build/repo.targets index 891386d0d28..f69803ea18d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -97,7 +97,6 @@ $(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); - $(DesignTimeBuildProps);MicrosoftNETCoreApp30PackageVersion=$(MicrosoftNETCoreApp30PackageVersion); @@ -210,13 +209,9 @@ Packages="@(_LineupPackages)" OutputPath="$(GeneratedPackageVersionPropsPath)" /> - - - - diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 40050f65a4f..82c90e29a2b 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index a1d4f65b482..09c4c702d62 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -103,7 +103,6 @@ and are generated based on the last package release. - @@ -115,7 +114,6 @@ and are generated based on the last package release. - @@ -123,29 +121,25 @@ and are generated based on the last package release. + + + - - - - - - - - - - - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml new file mode 100644 index 00000000000..810775dee9d --- /dev/null +++ b/eng/Version.Details.xml @@ -0,0 +1,367 @@ + + + + + https://github.com/aspnet/AspNetCore-Tooling + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/EntityFrameworkCore + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/corefx + 000000 + + + https://github.com/dotnet/core-setup + 000000 + + + https://github.com/dotnet/core-setup + 000000 + + + https://github.com/dotnet/core-setup + 000000 + + + + + https://github.com/aspnet/Extensions + 000000 + + + https://github.com/aspnet/Extensions + 000000 + + + diff --git a/eng/Versions.props b/eng/Versions.props index 8adc6dcbbd9..d0e0fa9d3ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,6 +3,179 @@ This file defines the versions of external dependencies used by ASP.NET Core. This file might be updated by automation. - TODO: move versions from build/dependencies.props into this location. Depends on https://github.com/aspnet/AspNetCore/issues/4246. --> - + + + + + 3.0.0-preview-27219-3 + 3.0.0-preview-27219-3 + 3.0.0-preview-27219-3 + + + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.7.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 1.7.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + 4.6.0-preview.18619.1 + + + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + 3.0.0-preview.19059.4 + + + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + 3.0.0-preview.18604.3 + + + 3.0.0-preview-19057-06 + + + + $(KoreBuildVersion) + 3.0.0-build-20190110.4 + 1.0.0-alpha-004 + 15.9.0 + + + + + + 4.5.0 + 4.5.2 + 4.5.2 + 4.3.2 + + + 1.10.0 + 5.2.6 + + + 2.3.2 + 15.8.166 + 15.8.166 + 2.8.0 + 2.8.0 + 2.8.0 + 3.19.8 + 5.3.0 + 5.3.0 + 5.3.0 + 2.1.1 + 1.0.1 + 3.0.1 + 3.0.1 + 11.1.0 + 1.4.0 + 5.3.0 + 8.1.4 + + + 0.9.9 + 0.10.13 + 4.2.1 + 4.2.1 + 2.3.0 + 2.3.0 + 2.3.0 + 3.1.0 + 1.7.3.4 + 4.10.0 + 1.0.2 + 12.0.1 + 3.12.1 + 17.17134.0 + 2.43.0 + 3.12.1 + 1.4.0 + 4.0.0 + 2.0.513 + 3.1.1 + 1.3.7 + 2.0.1 + 0.10.0 + 2.3.1 + 2.3.1 + 2.3.1 + 2.4.0 + 2.4.0 + + + diff --git a/src/AuthSamples/build/dependencies.props b/src/AuthSamples/build/dependencies.props index 87bd618059e..8212c5b5641 100644 --- a/src/AuthSamples/build/dependencies.props +++ b/src/AuthSamples/build/dependencies.props @@ -32,42 +32,21 @@ 3.0.0-alpha1-10772 3.0.0-alpha1-10772 3.0.0-preview-181106-14 - 2.2.1 - 2.3.2 3.0.0-alpha1-10706 - 3.0.0-alpha1-10706 3.0.0-alpha1-10706 3.0.0-alpha1-10706 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 3.0.0-preview-181106-14 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 3.0.0-preview-181106-14 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.19.8 - 5.3.0 - 3.0.0-preview1-26907-05 + 3.0.0-preview1-26907-05 3.0.0-preview.19053.2 - 15.6.1 - 3.0.1 - 3.0.0-alpha1-10772 - 4.10.0 - 2.0.3 - 4.6.0-preview1-26907-04 + 15.9.0 0.10.0 2.3.1 2.4.0 - diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props index 27f7138ba4b..9f54c3ac3f1 100644 --- a/src/Framework/Directory.Build.props +++ b/src/Framework/Directory.Build.props @@ -1,15 +1,15 @@ - - - - true - - + + + + + true + diff --git a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj index 121ccb3d981..6e5e88e4536 100644 --- a/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj +++ b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj @@ -11,12 +11,12 @@ - - - - - - + + + + + + diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj index 113947a0a12..10a068db815 100644 --- a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj +++ b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj @@ -11,16 +11,16 @@ - + - - + + - - - + + + diff --git a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj index 6c6395955e5..81f0d939d72 100644 --- a/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj +++ b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj @@ -17,7 +17,8 @@ - + + diff --git a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj index 58a8c695f93..244f054fa00 100644 --- a/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj +++ b/src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj @@ -21,8 +21,9 @@ - - + + + diff --git a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj index f84a58e597d..ec78062e915 100644 --- a/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj +++ b/src/Servers/IIS/IIS/test/testassets/InProcessForwardsCompatWebSite/InProcessWebSite.csproj @@ -18,7 +18,11 @@ - + + + + + diff --git a/src/SiteExtensions/LoggingAggregate/build/dependencies.props b/src/SiteExtensions/LoggingAggregate/build/dependencies.props index ef1eb218ffe..7fd2b962dc0 100644 --- a/src/SiteExtensions/LoggingAggregate/build/dependencies.props +++ b/src/SiteExtensions/LoggingAggregate/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + 2.1.1-rtm-31076 diff --git a/src/Templating/Directory.Build.targets b/src/Templating/Directory.Build.targets index c73225cc3fd..f5a3f65909e 100644 --- a/src/Templating/Directory.Build.targets +++ b/src/Templating/Directory.Build.targets @@ -1,6 +1,6 @@ - $(MicrosoftNETCoreApp30PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) diff --git a/src/Templating/build/dependencies.props b/src/Templating/build/dependencies.props index ac09eba34b5..ea9c1db1b35 100644 --- a/src/Templating/build/dependencies.props +++ b/src/Templating/build/dependencies.props @@ -21,10 +21,9 @@ 3.0.0-preview-181109-02 3.0.0-preview-181109-02 3.0.0-preview-181113-11 - 3.0.0-preview1-26907-05 + 3.0.0-preview1-26907-05 3.0.0-preview-18579-0056 15.6.1 - 2.0.3 3.12.1 17.17134.0 3.12.1 diff --git a/src/Templating/build/repo.props b/src/Templating/build/repo.props index 0dcc5a7de21..bdaa4d3ed7b 100644 --- a/src/Templating/build/repo.props +++ b/src/Templating/build/repo.props @@ -6,7 +6,7 @@ - +