diff --git a/.gitignore b/.gitignore index e8cd589251..3af0091ea3 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,3 @@ global.json .deps/ .rw/ .ro/ -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index 787f9a83f8..e43856d359 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,5 @@ + diff --git a/Directory.Build.targets b/Directory.Build.targets index f75adf7e4d..e83ff95e39 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,2 +1,5 @@  + + $(MicrosoftNETCoreApp20PackageVersion) + diff --git a/NuGet.config b/NuGet.config index 8a937d9f50..4e8a1f6de1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index 4dfc6e6b11..def51bc728 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,19 +1,32 @@  - - - 0.5.0-* - 2.1.0-* - - 4.4.0-* - 2.0.0-preview2-* - 2.1.1-* - 10.0.1 - 4.7.49 - 2.0.0-* - 2.0.0-* - 15.3.0 - 2.3.0 + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + + 2.1.0-preview1-15541 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 0.5.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.1.0-preview1-27424 + 2.0.0 + 15.3.0 + 4.7.49 + 2.0.0 + 2.3.0 + 2.3.0 + + diff --git a/build/repo.props b/build/repo.props index 39ccbe3845..1894f74d76 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,3 +1,6 @@ - + + Internal.AspNetCore.Universe.Lineup + https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json + diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000000..5dfe0a2e0d --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15541 +commithash:0f388d759de1c87fe58383bc9eb1020228885d4d diff --git a/korebuild.json b/korebuild.json new file mode 100644 index 0000000000..bd5d51a51b --- /dev/null +++ b/korebuild.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", + "channel": "dev" +} diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index 35b28c8284..eabea3b14b 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index d704a37df9..410f24daa9 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ - + diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj index f7d0f3ba81..e183b31571 100644 --- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj +++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj @@ -9,21 +9,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index d704a37df9..410f24daa9 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,6 +2,6 @@ - + diff --git a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj index 131e2ee181..1281e63751 100644 --- a/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj @@ -21,11 +21,10 @@ - - - - - + + + + + - diff --git a/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj b/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj index 7da44ee745..871a640f86 100644 --- a/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj +++ b/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj @@ -7,10 +7,13 @@ - - - - - \ No newline at end of file + + + + + + + + diff --git a/version.props b/version.props new file mode 100644 index 0000000000..e5fd0676de --- /dev/null +++ b/version.props @@ -0,0 +1,9 @@ + + + 2.1.0 + preview1 + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + $(VersionSuffix)-$(BuildNumber) + + diff --git a/version.xml b/version.xml deleted file mode 100644 index 88464f4cc3..0000000000 --- a/version.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - dev - 2.1.0 - preview1 - $(VersionSuffix) - $(VersionSuffix)-$(BuildNumber) - $(VersionPrefix) - $(Version)-$(VersionSuffix) - -