From 9ba04c394b8242dd44be5c74500b2ce580b98f8e Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Mon, 15 Feb 2021 13:53:06 +0100 Subject: [PATCH] Added Directory.Build.props to replace SolutionInfo --- src/Directory.Build.props | 12 ++++++++++ src/SolutionInfo.cs | 22 ------------------- src/Umbraco.Core/Umbraco.Core.csproj | 5 ----- .../Umbraco.Examine.Lucene.csproj | 4 +--- .../Umbraco.Infrastructure.csproj | 1 - .../Umbraco.ModelsBuilder.Embedded.csproj | 1 - .../Umbraco.Persistence.SqlCe.csproj | 1 - .../Umbraco.PublishedCache.NuCache.csproj | 1 - .../Umbraco.Web.BackOffice.csproj | 1 - .../Umbraco.Web.Common.csproj | 1 - .../Umbraco.Web.UI.NetCore.csproj | 1 - src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 5 +---- .../Umbraco.Web.Website.csproj | 1 - src/Umbraco.Web/Umbraco.Web.csproj | 5 +---- src/umbraco.sln | 1 - 15 files changed, 15 insertions(+), 47 deletions(-) create mode 100644 src/Directory.Build.props delete mode 100644 src/SolutionInfo.cs diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000000..c2dddd6871 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,12 @@ + + + 0.5.0 + 0.5.0 + 0.5.0-beta + 0.5.0 + 9.0 + en-US + Umbraco CMS + Copyright © Umbraco 2021 + + diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs deleted file mode 100644 index 3a1f151388..0000000000 --- a/src/SolutionInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Reflection; -using System.Resources; - -[assembly: AssemblyCompany("Umbraco")] -[assembly: AssemblyCopyright("Copyright © Umbraco 2021")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: NeutralResourcesLanguage("en-US")] - -// versions -// read https://stackoverflow.com/questions/64602/what-are-differences-between-assemblyversion-assemblyfileversion-and-assemblyin - -// note: do NOT change anything here manually, use the build scripts - -// this is the ONLY ONE the CLR cares about for compatibility -// should change ONLY when "hard" breaking compatibility (manual change) -[assembly: AssemblyVersion("0.5.0")] - -// these are FYI and changed automatically -[assembly: AssemblyFileVersion("0.5.0")] -[assembly: AssemblyInformationalVersion("0.5.0-alpha003")] diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 642aaf8814..6a73ae2890 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -2,12 +2,7 @@ netstandard2.0 - 8 Umbraco.Core - 0.5.0 - 0.5.0 - 0.5.0 - Umbraco CMS diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index 137d4d425c..590e634e23 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -3,16 +3,14 @@ net472 Umbraco.Examine - Umbraco CMS Umbraco.Examine.Lucene - 8 true bin\Release\Umbraco.Examine.Lucene.xml - + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 8115c95c50..f295805a55 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -2,7 +2,6 @@ netstandard2.0 - 8 diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj index f2c34adc0b..3d24bd879a 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj +++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj @@ -3,7 +3,6 @@ net5.0 Library - latest diff --git a/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj b/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj index effcc77a20..f77782d976 100644 --- a/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj +++ b/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj @@ -1,7 +1,6 @@  - 8 net472 diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index 9f63604b0e..ab9bcc2f90 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -3,7 +3,6 @@ netstandard2.0 Umbraco.Infrastructure.PublishedCache - 8 diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 48d25841fd..7675d1cede 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -3,7 +3,6 @@ net5.0 Library - latest diff --git a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj index 1d09f5f897..26e8287935 100644 --- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj +++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj @@ -3,7 +3,6 @@ net5.0 Library - latest diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index 15fefb0593..b238b3598e 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -3,7 +3,6 @@ net5.0 Umbraco.Web.UI.NetCore - latest bin\Release\Umbraco.Web.UI.NetCore.xml diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index d8075d8867..6205dc67a3 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -126,9 +126,6 @@ - - Properties\SolutionInfo.cs - True @@ -315,4 +312,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj index 2ff13dec89..4e898f349e 100644 --- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj +++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj @@ -3,7 +3,6 @@ net5.0 Library - latest diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index b56b4b1450..92009208b1 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -126,9 +126,6 @@ - - Properties\SolutionInfo.cs - @@ -233,4 +230,4 @@ - \ No newline at end of file + diff --git a/src/umbraco.sln b/src/umbraco.sln index 2056ef4601..b7f54cead9 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4 ..\build\build-bootstrap.ps1 = ..\build\build-bootstrap.ps1 ..\build\build.ps1 = ..\build\build.ps1 ..\NuGet.Config = ..\NuGet.Config - SolutionInfo.cs = SolutionInfo.cs ..\linting\stylecop.json = ..\linting\stylecop.json ..\linting\codeanalysis.ruleset = ..\linting\codeanalysis.ruleset ..\linting\codeanalysis.tests.ruleset = ..\linting\codeanalysis.tests.ruleset