Skip to content

Commit 793e9be

Browse files
Merge branch 'release/17.0.0'
2 parents 4464d2b + 016939b commit 793e9be

File tree

33 files changed

+2156
-1705
lines changed

33 files changed

+2156
-1705
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,3 +479,5 @@ src/**/packages.lock.json
479479
tests/**/packages.lock.json
480480
**/appsettings-schema.**
481481
**/umbraco-package-schema.json
482+
nul
483+
.idea

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Company>Umbraco HQ</Company>
55
<Authors>Umbraco</Authors>
66
<Copyright>Copyright © Umbraco $([System.DateTime]::Today.ToString('yyyy'))</Copyright>
@@ -32,8 +32,8 @@
3232

3333
<!-- Package validation -->
3434
<PropertyGroup>
35-
<EnablePackageValidation>true</EnablePackageValidation>
36-
<PackageValidationBaselineVersion>16.0.0</PackageValidationBaselineVersion>
35+
<EnablePackageValidation>false</EnablePackageValidation>
36+
<PackageValidationBaselineVersion>17.0.0</PackageValidationBaselineVersion>
3737
<EnableStrictModeForCompatibleFrameworksInPackage>true</EnableStrictModeForCompatibleFrameworksInPackage>
3838
<EnableStrictModeForCompatibleTfms>true</EnableStrictModeForCompatibleTfms>
3939
</PropertyGroup>

Directory.Packages.props

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
</PropertyGroup>
77
<ItemGroup>
8-
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
9-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
8+
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
9+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" />
1010
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
1111
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageVersion Include="AutoMapper" Version="[12.0.1, 13)" />
15-
<PackageVersion Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="[12.0.1, 13)" />
16-
<PackageVersion Include="FluentValidation" Version="11.9.0" />
17-
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="[6.0.0, 7.0)" />
18-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
19-
<PackageVersion Include="Umbraco.Cms" Version="[16.0.0, 16.999.999)" />
20-
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[16.0.0, 16.999.999)" />
21-
<PackageVersion Include="Umbraco.Cms.Web.BackOffice" Version="[16.0.0, 16.999.999)" />
22-
<PackageVersion Include="Umbraco.Commerce" Version="[16.0.0, 16.999.999)" />
23-
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
24-
<PackageVersion Include="xunit" Version="2.6.6" />
25-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
14+
<PackageVersion Include="FluentValidation" Version="12.1.0" />
15+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="[6.0.0, 6.999.999)" />
16+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
17+
<PackageVersion Include="Umbraco.Cms" Version="[17.0.0, 17.999.999)" />
18+
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[17.0.0, 17.999.999)" />
19+
<PackageVersion Include="Umbraco.Cms.Web.BackOffice" Version="[17.0.0, 17.999.999)" />
20+
<PackageVersion Include="Umbraco.Commerce" Version="[17.0.0, 17.999.999)" />
21+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
22+
<PackageVersion Include="xunit" Version="2.9.3" />
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
2624
</ItemGroup>
2725
</Project>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ parameters:
1919
default: false
2020

2121
variables:
22-
nodeVersion: 18.x
22+
nodeVersion: 22.x
2323
solution: Umbraco.Commerce.ProductFeeds.sln
2424
buildConfiguration: Release
2525
DOTNET_NOLOGO: true

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

src/Umbraco.Commerce.ProductFeeds.Client/Umbraco.Commerce.ProductFeeds.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Title>Umbraco Commerce Product Feeds Client</Title>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<Description>Contains frontend code of the project</Description>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
@umbraco-commerce:registry=https://www.myget.org/F/umbraconightly/npm/
2+
@umbraco-cms:registry=https://www.myget.org/F/umbracoprereleases/npm/

0 commit comments

Comments
 (0)