diff --git a/.gitignore b/.gitignore index a55ed22934..79ab4fd067 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,3 @@ project.lock.json *.nuget.props *.nuget.targets global.json -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index cf022578be..ed8924e122 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@ - + + Microsoft ASP.NET Core @@ -9,7 +10,6 @@ $(MSBuildThisFileDirectory)build\Key.snk true true - $(VersionSuffix)-$(BuildNumber) true 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 20060c934e..4e8a1f6de1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..94936eaa6a --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,41 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 2.1.0-preview1-15550 + 1.0.0-pre-10141 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 0.5.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.1.0-preview1-27496 + 2.0.0 + 15.3.0 + 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 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index a6e3621e53..7e07720d75 100644 --- a/build/repo.props +++ b/build/repo.props @@ -4,7 +4,11 @@ - - + + + + 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..36d8056037 --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-preview1-15550 +commithash:0dd080d0d87b4d1966ec0af9961dc8bacc04f84f 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/IISSample/IISSample.csproj b/samples/IISSample/IISSample.csproj index ed55b33f90..826a6eb9c4 100644 --- a/samples/IISSample/IISSample.csproj +++ b/samples/IISSample/IISSample.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,7 +9,7 @@ - - + + diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index 04a53a5e88..a5702825de 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -6,6 +6,6 @@ - + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9d9a3de33a..4b89a431e7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index 2fece72fce..ac1b122612 100644 --- a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -10,22 +10,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9d9a3de33a..4b89a431e7 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index 926b474d8d..b2a3c97f31 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + diff --git a/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj b/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj index 7a6a32c517..0d567632e2 100644 --- a/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj +++ b/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj @@ -13,13 +13,13 @@ - - - - - - - - + + + + + + + + diff --git a/test/IISTestSite/IISTestSite.csproj b/test/IISTestSite/IISTestSite.csproj index 37d65cc5e9..449323c616 100644 --- a/test/IISTestSite/IISTestSite.csproj +++ b/test/IISTestSite/IISTestSite.csproj @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index cb27cf6687..5649043f89 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/test/TestSites/TestSites.csproj b/test/TestSites/TestSites.csproj index d040f43ce6..5764654aff 100644 --- a/test/TestSites/TestSites.csproj +++ b/test/TestSites/TestSites.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + 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 - -