diff --git a/.gitignore b/.gitignore index 42fe21b818d..d5531fa9e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -294,4 +294,3 @@ __pycache__/ *.btm.cs *.odx.cs *.xsd.cs -korebuild-lock.txt diff --git a/Directory.Build.props b/Directory.Build.props index a8712cd13da..ec76707345e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,6 @@  - + + $(MSBuildThisFileDirectory)build\Key.snk @@ -7,12 +8,12 @@ Microsoft Entity Framework Core True git - $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory) https://github.com/aspnet/EntityFramework.git True full true - 1.0.0 + 7.1 diff --git a/Directory.Build.targets b/Directory.Build.targets index 8296c128352..0bb491b170c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,14 +1,7 @@ - - - - <_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)'. - - - - - + + + + $(MicrosoftNETCoreApp11PackageVersion) + $(MicrosoftNETCoreApp20PackageVersion) + diff --git a/NuGet.config b/NuGet.config index 20060c934e4..4e8a1f6de15 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + diff --git a/README.md b/README.md index 692c205879c..fcd06ddd403 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ More details about our project, like our release [roadmap](https://github.com/as ## 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/EntityFrameworkCore/wiki/Getting-and-Building-the-Code) for more details. diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props deleted file mode 100644 index 271245d35f6..00000000000 --- a/benchmarks/Directory.Build.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - true - - - - 7.1 - - diff --git a/benchmarks/Directory.Build.targets b/benchmarks/Directory.Build.targets deleted file mode 100644 index 551819f9434..00000000000 --- a/benchmarks/Directory.Build.targets +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/benchmarks/EFCore.Benchmarks.EF6/EFCore.Benchmarks.EF6.csproj b/benchmarks/EFCore.Benchmarks.EF6/EFCore.Benchmarks.EF6.csproj index b4d5958e50c..09a570c585b 100644 --- a/benchmarks/EFCore.Benchmarks.EF6/EFCore.Benchmarks.EF6.csproj +++ b/benchmarks/EFCore.Benchmarks.EF6/EFCore.Benchmarks.EF6.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/benchmarks/EFCore.Benchmarks.EFCore/EFCore.Benchmarks.EFCore.csproj b/benchmarks/EFCore.Benchmarks.EFCore/EFCore.Benchmarks.EFCore.csproj index b60af74839a..5722a79b3cd 100644 --- a/benchmarks/EFCore.Benchmarks.EFCore/EFCore.Benchmarks.EFCore.csproj +++ b/benchmarks/EFCore.Benchmarks.EFCore/EFCore.Benchmarks.EFCore.csproj @@ -20,9 +20,9 @@ - - - + + + diff --git a/benchmarks/EFCore.Benchmarks.EFCore1/EFCore.Benchmarks.EFCore1.csproj b/benchmarks/EFCore.Benchmarks.EFCore1/EFCore.Benchmarks.EFCore1.csproj index 65ba1eb4c3a..0f6c04bc78f 100644 --- a/benchmarks/EFCore.Benchmarks.EFCore1/EFCore.Benchmarks.EFCore1.csproj +++ b/benchmarks/EFCore.Benchmarks.EFCore1/EFCore.Benchmarks.EFCore1.csproj @@ -5,8 +5,6 @@ netcoreapp1.1 Microsoft.EntityFrameworkCore.Benchmarks.EFCore1 Exe - - 1.1.2 @@ -21,8 +19,8 @@ - - + + diff --git a/benchmarks/EFCore.Benchmarks.EFCore2/EFCore.Benchmarks.EFCore2.csproj b/benchmarks/EFCore.Benchmarks.EFCore2/EFCore.Benchmarks.EFCore2.csproj index 7c7688356f0..f9813b9feb2 100644 --- a/benchmarks/EFCore.Benchmarks.EFCore2/EFCore.Benchmarks.EFCore2.csproj +++ b/benchmarks/EFCore.Benchmarks.EFCore2/EFCore.Benchmarks.EFCore2.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/benchmarks/EFCore.Benchmarks/EFCore.Benchmarks.csproj b/benchmarks/EFCore.Benchmarks/EFCore.Benchmarks.csproj index 38d5af662fc..ffd45f2bcb8 100644 --- a/benchmarks/EFCore.Benchmarks/EFCore.Benchmarks.csproj +++ b/benchmarks/EFCore.Benchmarks/EFCore.Benchmarks.csproj @@ -10,22 +10,22 @@ - + - - - + + + - - + + - + diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 00000000000..4117930c500 --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,44 @@ + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + 0.10.9 + 1.1.2 + 1.1.2 + 4.3.1 + 2.0.0 + 2.0.0 + 6.1.3 + 2.1.0-preview1-15549 + 2.1.0-preview1-27473 + 2.3.1 + 4.4.0 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.1.0-preview1-27473 + 2.0.0 + 2.1.0-preview1-27473 + 1.1.4 + 2.0.0 + 15.3.0 + 10.0.1 + 12.2.1100 + 2.2.0-alpha-002 + 1.1.8 + 1.0.0 + 1.4.0 + 4.4.0 + 4.4.0 + 4.4.1 + 3.1.1 + 2.3.0 + 2.3.0 + 2.3.0 + + + diff --git a/build/repo.props b/build/repo.props index 7875cfcc6fa..3200babb9af 100644 --- a/build/repo.props +++ b/build/repo.props @@ -6,15 +6,19 @@ - + - - + + + Internal.AspNetCore.Universe.Lineup + https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json + + diff --git a/build/repo.targets b/build/repo.targets index 898c18ec439..77b581bea9a 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,4 +1,4 @@ - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 00000000000..45463cc71ec --- /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 00000000000..bd5d51a51b0 --- /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/Directory.Build.props b/samples/Directory.Build.props deleted file mode 100644 index 88268fcb714..00000000000 --- a/samples/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 7.1 - - diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets deleted file mode 100644 index 551819f9434..00000000000 --- a/samples/Directory.Build.targets +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/samples/OracleProvider/Directory.Build.props b/samples/OracleProvider/Directory.Build.props deleted file mode 100644 index d25875a9c81..00000000000 --- a/samples/OracleProvider/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - 7.1 - - diff --git a/samples/OracleProvider/Directory.Build.targets b/samples/OracleProvider/Directory.Build.targets deleted file mode 100644 index 551819f9434..00000000000 --- a/samples/OracleProvider/Directory.Build.targets +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/samples/OracleProvider/README.md b/samples/OracleProvider/README.md index 5f93be40960..07b2bf8f7d5 100644 --- a/samples/OracleProvider/README.md +++ b/samples/OracleProvider/README.md @@ -17,22 +17,12 @@ - All query tests passing (aside from a few failing due to various Oracle specific issues). - All runtime tests passing (aside from those directly related to the limitations above). -## Opening solution: -Run following commands at repository root -``` -.\build /t:Pin -cd Samples\OracleProvider -dotnet restore -.\OracleProvider.sln -``` -If you see a warning about KoreBuild using different dotnet than the one in PATH then check [Getting and Building the Code\(https://github.com/aspnet/EntityFrameworkCore/wiki/getting-and-building-the-code) - ## Running the tests -1) Install [Oracle Database 12c Release 2 (12.2.0.1.0) - Standard Edition 2](http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html) +1) Install [Oracle Database 12c Release 2 (12.2.0.1.0) - Standard Edition 2](http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html) - When installing, ensure to enable pluggable databases - the sample relies on a specific pluggable database. -2) Use a shell to connect via SQLPlus: +2) Use a shell to connect via SQLPlus: ``` > sqlplus / as sysdba @@ -46,7 +36,7 @@ If you see a warning about KoreBuild using different dotnet than the one in PATH ROLES = (DBA) FILE_NAME_CONVERT = ('\pdbseed\', '\pdb_ef\'); ``` - + 4) Open the pluggable database: ``` diff --git a/samples/OracleProvider/src/OracleProvider/OracleProvider.csproj b/samples/OracleProvider/src/OracleProvider/OracleProvider.csproj index af9a2e8193d..853a447028d 100644 --- a/samples/OracleProvider/src/OracleProvider/OracleProvider.csproj +++ b/samples/OracleProvider/src/OracleProvider/OracleProvider.csproj @@ -28,15 +28,9 @@ - - - - KRB4002 - - - - KRB4002 - + + + diff --git a/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj b/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj index 43133265ab4..f2c97ce37e4 100644 --- a/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj +++ b/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj @@ -101,10 +101,10 @@ - - - - + + + + diff --git a/samples/QueryFilters/QueryFilters.csproj b/samples/QueryFilters/QueryFilters.csproj index 3ac94d3b1f6..b39bee0759f 100644 --- a/samples/QueryFilters/QueryFilters.csproj +++ b/samples/QueryFilters/QueryFilters.csproj @@ -1,4 +1,4 @@ - + Exe netcoreapp2.0 @@ -8,4 +8,4 @@ - \ No newline at end of file + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9d9a3de33ac..1e0980f6633 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,6 +2,6 @@ - + diff --git a/src/EFCore.Design/EFCore.Design.csproj b/src/EFCore.Design/EFCore.Design.csproj index 29f65e9dcc4..828677c298d 100644 --- a/src/EFCore.Design/EFCore.Design.csproj +++ b/src/EFCore.Design/EFCore.Design.csproj @@ -18,11 +18,8 @@ - - - - KRB4002 - + + diff --git a/src/EFCore.InMemory/EFCore.InMemory.csproj b/src/EFCore.InMemory/EFCore.InMemory.csproj index 21d21fabeba..5f43ec65a20 100644 --- a/src/EFCore.InMemory/EFCore.InMemory.csproj +++ b/src/EFCore.InMemory/EFCore.InMemory.csproj @@ -45,10 +45,7 @@ - - - KRB4002 - + diff --git a/src/EFCore.Relational/EFCore.Relational.csproj b/src/EFCore.Relational/EFCore.Relational.csproj index 9b7db36e541..8aca209f29f 100644 --- a/src/EFCore.Relational/EFCore.Relational.csproj +++ b/src/EFCore.Relational/EFCore.Relational.csproj @@ -19,12 +19,9 @@ - - - - - KRB4002 - + + + diff --git a/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index a935862882b..3979164767e 100644 --- a/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 8dec66bbe04..505262037aa 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -20,11 +20,8 @@ - - - KRB4002 - - + + diff --git a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj index eac5028fd97..da6e9744874 100644 --- a/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj +++ b/src/EFCore.Sqlite.Core/EFCore.Sqlite.Core.csproj @@ -21,11 +21,8 @@ - - - - KRB4002 - + + diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj index 5ee7f8f4050..d746423ded7 100644 --- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj +++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj @@ -20,7 +20,7 @@ - + None diff --git a/src/EFCore.Tools.DotNet/EFCore.Tools.DotNet.csproj b/src/EFCore.Tools.DotNet/EFCore.Tools.DotNet.csproj index 4a3d6723a0c..f02488f2d2b 100644 --- a/src/EFCore.Tools.DotNet/EFCore.Tools.DotNet.csproj +++ b/src/EFCore.Tools.DotNet/EFCore.Tools.DotNet.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/EFCore/EFCore.csproj b/src/EFCore/EFCore.csproj index 20b0c1e353c..86a312d7d2e 100644 --- a/src/EFCore/EFCore.csproj +++ b/src/EFCore/EFCore.csproj @@ -20,18 +20,15 @@ Microsoft.EntityFrameworkCore.DbSet - - - - - - - - - - - KRB4002 - + + + + + + + + + diff --git a/src/dotnet-ef/Resources/EntityFrameworkCore.targets b/src/dotnet-ef/Resources/EntityFrameworkCore.targets index 0f5c00a3d3a..d5970dfe909 100644 --- a/src/dotnet-ef/Resources/EntityFrameworkCore.targets +++ b/src/dotnet-ef/Resources/EntityFrameworkCore.targets @@ -1,4 +1,4 @@ - + - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index bc7b46322b0..9756d78f222 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -6,12 +6,12 @@ - - + + - - - - + + + + diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index b45a254e733..9916baecbe6 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj index 45dc8c738a7..edb344fcff0 100644 --- a/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj +++ b/test/EFCore.Relational.Tests/EFCore.Relational.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj index 372aa5149ba..bcaa86bdf43 100644 --- a/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj +++ b/test/EFCore.SqlServer.FunctionalTests/EFCore.SqlServer.FunctionalTests.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index 92f64e690f3..f6cdc942688 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -28,7 +28,7 @@ - + diff --git a/test/ef.Tests/ef.Tests.csproj b/test/ef.Tests/ef.Tests.csproj index 4bcb04c9af4..e5e3eba251d 100644 --- a/test/ef.Tests/ef.Tests.csproj +++ b/test/ef.Tests/ef.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/version.props b/version.props new file mode 100644 index 00000000000..8542e1aae1e --- /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 bc16172f94e..00000000000 --- a/version.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - dev - 2.1.0 - preview1 - $(VersionSuffix)-$(BuildNumber) - -