Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice

# Conflicts: # src/Umbraco.Examine/Umbraco.Examine.csproj
2020-02-25 08:27:23 +01:00
parent 36b68f2966 4425c3d5c0
commit 04caec842a
13 changed files with 11 additions and 14 deletions
--- a/src/Umbraco.Configuration/Umbraco.Configuration.csproj
+++ b/src/Umbraco.Configuration/Umbraco.Configuration.csproj
@@ -2,6 +2,7 @@

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

    <ItemGroup>
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -2,7 +2,7 @@

    <PropertyGroup>
        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>7.3</LangVersion>
+        <LangVersion>8</LangVersion>
        <RootNamespace>Umbraco.Core</RootNamespace>
        <AssemblyVersion>9.0.0</AssemblyVersion>
        <InformationalVersion>9.0.0</InformationalVersion>
--- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
+++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
@@ -5,6 +5,7 @@
        <RootNamespace>Umbraco.Examine</RootNamespace>
        <Product>Umbraco CMS</Product>
        <Title>Umbraco.Examine.Lucene</Title>
+        <LangVersion>8</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
--- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
+++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
@@ -2,7 +2,7 @@

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

    <ItemGroup>
--- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
+++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj
@@ -12,7 +12,7 @@
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>8</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
--- a/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj
+++ b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj
@@ -2,6 +2,7 @@

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

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

    <ItemGroup>
--- a/src/Umbraco.TestData/Umbraco.TestData.csproj
+++ b/src/Umbraco.TestData/Umbraco.TestData.csproj
@@ -12,6 +12,7 @@
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <Deterministic>true</Deterministic>
+    <LangVersion>8</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
--- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
+++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj
@@ -12,6 +12,7 @@
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
+    <LangVersion>8</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -42,7 +42,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <Prefer32Bit>false</Prefer32Bit>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>8</LangVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
--- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
+++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
@@ -3,14 +3,10 @@
    <PropertyGroup>
        <TargetFramework>netcoreapp3.1</TargetFramework>
        <OutputType>Library</OutputType>
+        <LangVersion>8</LangVersion>
    </PropertyGroup>

    <ItemGroup>
-        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
      <ProjectReference Include="..\Umbraco.Configuration\Umbraco.Configuration.csproj" />
      <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
      <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
--- a/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
+++ b/src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
@@ -6,7 +6,6 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj" />
        <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj" />
        <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj" />
    </ItemGroup>
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -111,10 +111,6 @@
      <Project>{29aa69d9-b597-4395-8d42-43b1263c240a}</Project>
      <Name>Umbraco.Core</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
-      <Project>{f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8}</Project>
-      <Name>Umbraco.Examine</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Umbraco.Infrastructure\Umbraco.Infrastructure.csproj">
      <Project>{3ae7bf57-966b-45a5-910a-954d7c554441}</Project>
      <Name>Umbraco.Infrastructure</Name>