diff --git a/.gitignore b/.gitignore index eae9380097..e5775f626a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ *.dotCover *.orig *~ +msbuild.binlog ## If you have NuGet Package Restore enabled, uncomment this packages/ diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..49a3c3dcce --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,17 @@ + + + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/new-cli/Directory.Packages.props b/new-cli/Directory.Packages.props index 676e7a4845..db9565dcb3 100644 --- a/new-cli/Directory.Packages.props +++ b/new-cli/Directory.Packages.props @@ -1,20 +1,15 @@ + true - - - - - - + - \ No newline at end of file diff --git a/new-cli/GitVersion.Core/GitVersion.Core.csproj b/new-cli/GitVersion.Core/GitVersion.Core.csproj index f1a173613d..b96d2f9f1a 100644 --- a/new-cli/GitVersion.Core/GitVersion.Core.csproj +++ b/new-cli/GitVersion.Core/GitVersion.Core.csproj @@ -3,7 +3,7 @@ - + diff --git a/new-cli/GitVersion.sln b/new-cli/GitVersion.sln index d69d8b202f..115f750a5f 100644 --- a/new-cli/GitVersion.sln +++ b/new-cli/GitVersion.sln @@ -47,6 +47,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Core.Libgit2Shar EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Cli.Generator", "GitVersion.Cli.Generator\GitVersion.Cli.Generator.csproj", "{AF22F642-625A-4A33-92A5-161EE4E2B0CE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{D27CECCB-F012-433C-B026-84979C8C731E}" + ProjectSection(SolutionItems) = preProject + ..\global.json = ..\global.json + ..\Directory.Packages.props = ..\Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/.run/cli.run.xml b/src/.run/cli.run.xml new file mode 100644 index 0000000000..93b22def70 --- /dev/null +++ b/src/.run/cli.run.xml @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/src/.run/GitVersion.Schema.run.xml b/src/.run/schema.run.xml similarity index 90% rename from src/.run/GitVersion.Schema.run.xml rename to src/.run/schema.run.xml index 0ecc7bc03c..e57b890d7b 100644 --- a/src/.run/GitVersion.Schema.run.xml +++ b/src/.run/schema.run.xml @@ -1,5 +1,5 @@  - + - diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index fd844d5158..5ce85093a7 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,4 +1,5 @@ + true @@ -6,16 +7,11 @@ - - - - - @@ -25,9 +21,6 @@ - - - diff --git a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj index a255aa2d2b..446ac51a69 100644 --- a/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj +++ b/src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj @@ -13,6 +13,9 @@ + + + diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj index f38d47e1ba..014609042b 100644 --- a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj +++ b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj @@ -7,6 +7,7 @@ + diff --git a/src/GitVersion.sln b/src/GitVersion.sln index fd07b98004..cdcf7008da 100644 --- a/src/GitVersion.sln +++ b/src/GitVersion.sln @@ -36,13 +36,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{542E443E-14C ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props Directory.Packages.props = Directory.Packages.props - ..\.editorconfig = ..\.editorconfig - ..\.gitattributes = ..\.gitattributes - ..\.gitignore = ..\.gitignore - ..\GitVersion.yml = ..\GitVersion.yml - ..\schemas\6.0\GitVersion.configuration.json = ..\schemas\6.0\GitVersion.configuration.json - ..\schemas\6.0\GitVersion.json = ..\schemas\6.0\GitVersion.json - ..\global.json = ..\global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "readme", "readme", "{1F4BE015-699F-464A-8FF0-D8762102421A}" @@ -56,6 +49,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "readme", "readme", "{1F4BE0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersion.Configuration.Tests", "GitVersion.Configuration.Tests\GitVersion.Configuration.Tests.csproj", "{E3722E82-D283-4BA7-B44F-C43072B829FA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{7D3A83B4-95D9-42AF-AB11-6292209CF00B}" + ProjectSection(SolutionItems) = preProject + ..\.editorconfig = ..\.editorconfig + ..\.gitattributes = ..\.gitattributes + ..\.gitignore = ..\.gitignore + ..\GitVersion.yml = ..\GitVersion.yml + ..\global.json = ..\global.json + ..\schemas\6.0\GitVersion.json = ..\schemas\6.0\GitVersion.json + ..\schemas\6.0\GitVersion.configuration.json = ..\schemas\6.0\GitVersion.configuration.json + ..\Directory.Packages.props = ..\Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -132,9 +137,9 @@ Global {85060C01-6DAF-48E9-9D7E-AEDA8FFEB0DD} = {69C36B9D-E496-42A2-B091-C055E999686C} {843450BC-3A6D-4DA6-8520-2D9A9C8218AC} = {69C36B9D-E496-42A2-B091-C055E999686C} {13C60949-7225-4B08-BE63-CAAC5E25FD16} = {69C36B9D-E496-42A2-B091-C055E999686C} - {1F4BE015-699F-464A-8FF0-D8762102421A} = {542E443E-14C3-45A7-A2E9-ACF27286A3B2} {B93C3F0C-6CBF-49E6-A476-A0103319640B} = {69C36B9D-E496-42A2-B091-C055E999686C} {E3722E82-D283-4BA7-B44F-C43072B829FA} = {69C36B9D-E496-42A2-B091-C055E999686C} + {1F4BE015-699F-464A-8FF0-D8762102421A} = {7D3A83B4-95D9-42AF-AB11-6292209CF00B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0C1C310E-7A4D-4032-878B-6DC375894C49} diff --git a/tests/integration/Directory.Packages.props b/tests/integration/Directory.Packages.props new file mode 100644 index 0000000000..1ef9ac25e7 --- /dev/null +++ b/tests/integration/Directory.Packages.props @@ -0,0 +1,6 @@ + + + + false + +