yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/align-namespaces

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Search/ExamineComposer.cs
This commit is contained in:
Mole
2021-02-15 15:45:03 +01:00
parent 5ef01d0e5c 2fa5c8e3be
commit 7e8c7fdc2b
12 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Directory.Build.props Normal file
View File

@@ -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>

22
src/SolutionInfo.cs
View File

@@ -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")]

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -8,6 +8,7 @@
<InformationalVersion>0.5.0</InformationalVersion>
<FileVersion>0.5.0</FileVersion>
<Product>Umbraco CMS</Product>
<RootNamespace>Umbraco.Core</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

4
src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj
View File

@@ -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>

8
src/Umbraco.Infrastructure/Search/ExamineComposer.cs
View File

@@ -23,10 +23,10 @@ namespace Umbraco.Web.Search
// populators are not a collection: one cannot remove ours, and can only add more
// the container can inject IEnumerable<IIndexPopulator> and get them all
builder.Services.AddSingleton<MemberIndexPopulator>();
builder.Services.AddSingleton<ContentIndexPopulator>();
builder.Services.AddSingleton<PublishedContentIndexPopulator>();
builder.Services.AddSingleton<MediaIndexPopulator>();
builder.Services.AddSingleton<IIndexPopulator, MemberIndexPopulator>();
builder.Services.AddSingleton<IIndexPopulator, ContentIndexPopulator>();
builder.Services.AddSingleton<IIndexPopulator, PublishedContentIndexPopulator>();
builder.Services.AddSingleton<IIndexPopulator, MediaIndexPopulator>();
builder.Services.AddSingleton<IndexRebuilder>();
builder.Services.AddUnique<IUmbracoIndexConfig, UmbracoIndexConfig>();

1
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -2,7 +2,6 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>8</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

1
src/Umbraco.Persistence.SqlCe/Umbraco.Persistence.SqlCe.csproj
View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<LangVersion>8</LangVersion>
<TargetFramework>net472</TargetFramework>
<RootNamespace>Umbraco.Cms.Persistence.SqlCe</RootNamespace>
</PropertyGroup>

1
src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>Umbraco.Cms.Infrastructure.PublishedCache</RootNamespace>
<LangVersion>8</LangVersion>
<RootNamespace>Umbraco.Infrastructure.PublishedCache</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

1
src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
View File

@@ -4,6 +4,7 @@
<TargetFramework>net5.0</TargetFramework>
<RootNamespace>Umbraco.Cms.Web.UI.NetCore</RootNamespace>
<LangVersion>latest</LangVersion>
<RootNamespace>Umbraco.Web.UI.NetCore</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DocumentationFile>bin\Release\Umbraco.Web.UI.NetCore.xml</DocumentationFile>

5
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -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>

5
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -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>

1
src/umbraco.sln
View File

@@ -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