diff --git a/.gitignore b/.gitignore index a7fdfd773b..6da3c6a3e9 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,3 @@ node_modules .build/ .testPublish/ global.json -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index bec69077d1..c9fd7d291a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,6 +13,6 @@ - + diff --git a/Directory.Build.targets b/Directory.Build.targets index bc118fd907..e83ff95e39 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/README.md b/README.md index b0430c7868..692348309d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Antiforgery -=== +=========== AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/17l06rulbn328v4k/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Antiforgery/branch/dev) @@ -11,4 +11,4 @@ This project is part of ASP.NET Core. You can find documentation and getting sta Samples can be found in [Entropy](https://github.com/aspnet/Entropy). The [MVC](https://github.com/aspnet/Entropy/tree/dev/samples/Antiforgery.MvcWithAuthAndAjax) sample shows how to use Antiforgery in MVC when making AJAX requests. -The [Angular](https://github.com/aspnet/Entropy/tree/dev/samples/Antiforgery.Angular1) sample shows how to use Antiforgery with Angular 1. \ No newline at end of file +The [Angular](https://github.com/aspnet/Entropy/tree/dev/samples/Antiforgery.Angular1) sample shows how to use Antiforgery with Angular 1. diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 0000000000..203f4c839f --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,26 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 2.1.0-preview1-15541 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 2.1.0-preview1-27430 + 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 13fe1c296a..4bcc41619b 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,6 +1,6 @@  - - - - + + 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..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/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj index 051809e5de..e196bf7f56 100644 --- a/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj +++ b/src/Microsoft.AspNetCore.Antiforgery/Microsoft.AspNetCore.Antiforgery.csproj @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj index f6a72152bb..3fd4c8ec75 100644 --- a/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj +++ b/test/Microsoft.AspNetCore.Antiforgery.Test/Microsoft.AspNetCore.Antiforgery.Test.csproj @@ -10,16 +10,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/version.props b/version.props index cf1954f5c5..e5fd0676de 100644 --- a/version.props +++ b/version.props @@ -1,8 +1,9 @@ - 2.1.0 preview1 - $(VersionSuffix)-$(BuildNumber) + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + $(VersionSuffix)-$(BuildNumber)