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

Merge branch 'release/10.0.0' into v10/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	version.json
This commit is contained in:
Nikolaj
2022-05-20 10:20:51 +02:00
parent 9a4daa451a 9bafabf906
commit ed83784691
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Cms/Umbraco.Cms.csproj
View File

@@ -8,6 +8,9 @@
</PropertyGroup>
<IncludeSymbols>false</IncludeSymbols>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Umbraco.Cms.Persistence.Sqlite\Umbraco.Cms.Persistence.Sqlite.csproj" />
<ProjectReference Include="..\Umbraco.Cms.Persistence.SqlServer\Umbraco.Cms.Persistence.SqlServer.csproj" />
@@ -39,6 +42,7 @@
<Exec WorkingDirectory="$(JsonSchemaProjectPath)" Command="dotnet run -c Release -o &quot;../Umbraco.Cms/appsettings-schema.json&quot;" />
</Target>
<ItemGroup>
<Content Include="buildTransitive\**" PackagePath="buildTransitive" />
</ItemGroup>