Added Directory.Build.props to replace SolutionInfo

2021-02-15 13:53:06 +01:00
parent 1eac582649
commit 9ba04c394b
15 changed files with 15 additions and 47 deletions
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <Version>0.5.0</Version>
+    <AssemblyVersion>0.5.0</AssemblyVersion>
+    <InformationalVersion>0.5.0-beta</InformationalVersion>
+    <FileVersion>0.5.0</FileVersion>
+    <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Company>Umbraco CMS</Company>
+    <Copyright>Copyright © Umbraco 2021</Copyright>
+  </PropertyGroup>
+</Project>
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -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")]
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -2,12 +2,7 @@

    <PropertyGroup>
        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>8</LangVersion>
        <RootNamespace>Umbraco.Core</RootNamespace>
-        <AssemblyVersion>0.5.0</AssemblyVersion>
-        <InformationalVersion>0.5.0</InformationalVersion>
-        <FileVersion>0.5.0</FileVersion>
-        <Product>Umbraco CMS</Product>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -3,16 +3,14 @@
    <PropertyGroup>
        <TargetFramework>net472</TargetFramework>
        <RootNamespace>Umbraco.Examine</RootNamespace>
-        <Product>Umbraco CMS</Product>
        <Title>Umbraco.Examine.Lucene</Title>
-        <LangVersion>8</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
      <DebugSymbols>true</DebugSymbols>
      <DocumentationFile>bin\Release\Umbraco.Examine.Lucene.xml</DocumentationFile>
    </PropertyGroup>
-    
+
    <ItemGroup>
      <Compile Remove="obj\**" />
    </ItemGroup>
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -2,7 +2,6 @@

    <PropertyGroup>
        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>8</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -3,7 +3,6 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <OutputType>Library</OutputType>
-        <LangVersion>latest</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
--- a/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
+++ b/src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <LangVersion>8</LangVersion>
        <TargetFramework>net472</TargetFramework>
    </PropertyGroup>

--- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
+++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
@@ -3,7 +3,6 @@
    <PropertyGroup>
        <TargetFramework>netstandard2.0</TargetFramework>
        <RootNamespace>Umbraco.Infrastructure.PublishedCache</RootNamespace>
-        <LangVersion>8</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -3,7 +3,6 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <OutputType>Library</OutputType>
-        <LangVersion>latest</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
+++ b/src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
@@ -3,7 +3,6 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <OutputType>Library</OutputType>
-        <LangVersion>latest</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- 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 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <RootNamespace>Umbraco.Web.UI.NetCore</RootNamespace>
-        <LangVersion>latest</LangVersion>
    </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -126,9 +126,6 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="Properties\Settings.Designer.cs">
      <AutoGen>True</AutoGen>
@@ -315,4 +312,4 @@
    <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
    <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
  </Target>
-</Project>
+</Project>
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -3,7 +3,6 @@
    <PropertyGroup>
        <TargetFramework>net5.0</TargetFramework>
        <OutputType>Library</OutputType>
-        <LangVersion>latest</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -126,9 +126,6 @@
    <!--
    <Compile Include="**\*.cs" Exclude="obj\**\*.cs;**\*.aspx.cs;**\*.ascx.cs;**\*.designer.cs" />
    -->
-    <Compile Include="..\SolutionInfo.cs">
-      <Link>Properties\SolutionInfo.cs</Link>
-    </Compile>
    <Compile Include="AspNet\AspNetHostingEnvironment.cs" />
    <Compile Include="AspNet\AspNetApplicationShutdownRegistry.cs" />
    <Compile Include="AspNet\AspNetSessionManager.cs" />
@@ -233,4 +230,4 @@
  </ItemGroup>
  <ItemGroup />
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
--- 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