Skip to content

Commit 773fc9b

Browse files
authored
Merge pull request #36 from umbraco/feature/v10-migration
Packages migration to v10 & Umbraco 10 Test Site
2 parents 5115609 + 7dca99c commit 773fc9b

21 files changed

+1321
-6
lines changed

.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,18 @@ src/Umbraco.Cms.Integrations.Testsite.V8/App_Plugins
319319
src/Umbraco.Cms.Integrations.Testsite.V8/App_Data
320320
src/Umbraco.Cms.Integrations.Testsite.V8/Media
321321

322-
323322
src/Umbraco.Cms.Integrations.Testsite.V9/App_Plugins
324323
src/Umbraco.Cms.Integrations.Testsite.V9/umbraco
325324
src/Umbraco.Cms.Integrations.Testsite.V9/wwwroot/media
326325

326+
src/Umbraco.Cms.Integrations.Testsite.V10/App_Plugins
327+
src/Umbraco.Cms.Integrations.Testsite.V10/umbraco
328+
src/Umbraco.Cms.Integrations.Testsite.V10/wwwroot/media
329+
327330
src/Umbraco.Cms.Integrations.Crm.Hubspot.Testsite.V8/App_Data/
328331
src/Umbraco.Cms.Integrations.Crm.Hubspot.Testsite.V8/App_Plugins/
329332
src/Umbraco.Cms.Integrations.Crm.Hubspot.Testsite.V8/Media/
330333
src/Umbraco.Cms.Integrations.SEO.Semrush.Testsite.V8/App_Data/
331334
src/Umbraco.Cms.Integrations.SEO.Semrush.Testsite.V8/App_Plugins/
335+
336+
appsettings.Local.json

src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net50;net60</TargetFrameworks>
3+
<TargetFrameworks>net472;net50</TargetFrameworks>
44
</PropertyGroup>
55

66
<PropertyGroup>
@@ -20,7 +20,7 @@
2020
<PackageReference Include="UmbracoCms.Web" version="8.4.0" />
2121
</ItemGroup>
2222

23-
<ItemGroup Condition="'$(TargetFramework)' == 'net50' Or '$(TargetFramework)' == 'net60'">
23+
<ItemGroup Condition="'$(TargetFramework)' == 'net50'">
2424
<PackageReference Include="Umbraco.Cms.Web.Website" version="9.0.1" />
2525
<PackageReference Include="Umbraco.Cms.Web.BackOffice" version="9.0.1" />
2626
<PackageReference Include="Umbraco.Cms.Web.Common" version="9.0.1" />

0 commit comments

Comments
 (0)