diff --git a/.gitignore b/.gitignore index 8e1cee9e15..708c4155fa 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,3 @@ BenchmarkDotNet.Artifacts/ BDN.Generated/ binaries/ global.json -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index 4f6edcfad9..396fba05b3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@ - + + Microsoft ASP.NET Core @@ -9,20 +10,12 @@ $(MSBuildThisFileDirectory)build\Key.snk true true - $(VersionSuffix)-$(BuildNumber) true latest - - - KRB4002 - + + diff --git a/Directory.Build.targets b/Directory.Build.targets index 8296c12835..0ff17438fc 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,14 +1,5 @@ - - - - <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh - <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd - <_BootstrapperError> - Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. - Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. - - - - - + + + $(MicrosoftNETCoreApp20PackageVersion) + diff --git a/NuGet.config b/NuGet.config index c88189696c..9d49a5334e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,8 @@ - + + diff --git a/README.md b/README.md index 1af1c38364..7f2532761b 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,7 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge ## Building from source -To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. - -Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS). -This will execute only the part of the build script that downloads and initializes a few required build tools and packages. - -See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. +To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. ## Packages diff --git a/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj index 4797141dcb..0fb7d5af0a 100644 --- a/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj +++ b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..b8ba66b1f4 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,43 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + 0.10.9 + 2.1.0-preview1-15549 + 1.10.0 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.1.0-preview1-27475 + 2.0.0 + 2.6.0-beta2-62211-02 + 2.1.0-preview1-27475 + 15.3.0 + 4.7.49 + 10.0.1 + 4.4.0 + 0.1.0-e170811-6 + 4.4.0-preview3-25519-03 + 4.4.0 + 4.4.0 + 4.4.0 + 0.1.0-e170811-6 + 4.4.0 + 0.7.0 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index eadaa28976..30432c83ee 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,9 +1,8 @@ true + + Internal.AspNetCore.Universe.Lineup + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json - - - - diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 0000000000..45463cc71e --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15549 +commithash:f570e08585fec510dd60cd4bfe8795388b757a95 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 5dd0ddf608..a2567537c9 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 5236edee58..4b89a431e7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ - + diff --git a/src/Kestrel.Core/Kestrel.Core.csproj b/src/Kestrel.Core/Kestrel.Core.csproj index 764b0d5bd8..75793650b5 100644 --- a/src/Kestrel.Core/Kestrel.Core.csproj +++ b/src/Kestrel.Core/Kestrel.Core.csproj @@ -9,21 +9,17 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - - CurrentRuntime - - - - - - - - - - + + + + + + + + diff --git a/src/Kestrel.Https/Kestrel.Https.csproj b/src/Kestrel.Https/Kestrel.Https.csproj index e99a6f7423..de626b50b9 100644 --- a/src/Kestrel.Https/Kestrel.Https.csproj +++ b/src/Kestrel.Https/Kestrel.Https.csproj @@ -8,8 +8,6 @@ true aspnetcore;kestrel CS1591;$(NoWarn) - - CurrentRuntime @@ -17,7 +15,7 @@ - + diff --git a/src/Kestrel.Tls/Kestrel.Tls.csproj b/src/Kestrel.Tls/Kestrel.Tls.csproj index 8ab28b166c..3088fbcc46 100644 --- a/src/Kestrel.Tls/Kestrel.Tls.csproj +++ b/src/Kestrel.Tls/Kestrel.Tls.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj index 4251d64cea..bef2f77e60 100644 --- a/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj +++ b/src/Kestrel.Transport.Libuv/Kestrel.Transport.Libuv.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj index af86b481a2..1674a1d65f 100644 --- a/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj +++ b/src/Kestrel.Transport.Sockets/Kestrel.Transport.Sockets.csproj @@ -9,13 +9,11 @@ aspnetcore;kestrel true CS1591;$(NoWarn) - - CurrentRuntime - - + + diff --git a/src/Kestrel/Kestrel.csproj b/src/Kestrel/Kestrel.csproj index fd6008bdec..ac46ce4d3d 100644 --- a/src/Kestrel/Kestrel.csproj +++ b/src/Kestrel/Kestrel.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Protocols.Abstractions/Protocols.Abstractions.csproj b/src/Protocols.Abstractions/Protocols.Abstractions.csproj index 32fd561e98..192ee595fa 100644 --- a/src/Protocols.Abstractions/Protocols.Abstractions.csproj +++ b/src/Protocols.Abstractions/Protocols.Abstractions.csproj @@ -13,13 +13,13 @@ - - - - - - - + + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 7039b276a4..5891f8eb0b 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -10,12 +10,12 @@ - - - - - - + + + + + + diff --git a/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj index a23522d606..38f15bc983 100644 --- a/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj +++ b/test/Kestrel.Core.Tests/Kestrel.Core.Tests.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj b/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj index b4c4d93b69..43e2b9ff07 100644 --- a/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj +++ b/test/Kestrel.Transport.Libuv.FunctionalTests/Kestrel.Transport.Libuv.FunctionalTests.csproj @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj index 4c4aa8b562..ca477f9507 100644 --- a/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj +++ b/test/Kestrel.Transport.Libuv.Tests/Kestrel.Transport.Libuv.Tests.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj b/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj index 8030d18468..8bc5d93436 100644 --- a/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj +++ b/test/Kestrel.Transport.Sockets.FunctionalTests/Kestrel.Transport.Sockets.FunctionalTests.csproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/tools/CodeGenerator/CodeGenerator.csproj b/tools/CodeGenerator/CodeGenerator.csproj index fcdc836a7c..e7cf3a993f 100644 --- a/tools/CodeGenerator/CodeGenerator.csproj +++ b/tools/CodeGenerator/CodeGenerator.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/version.props b/version.props new file mode 100644 index 0000000000..5c4a7c32d1 --- /dev/null +++ b/version.props @@ -0,0 +1,10 @@ + + + 2.1.0 + preview1 + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + t000 + $(VersionSuffix)-$(BuildNumber) + + diff --git a/version.xml b/version.xml deleted file mode 100644 index 3c05022b7d..0000000000 --- a/version.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - dev - 2.1.0 - preview1 - -