Skip to content

Commit a7c866c

Browse files
Merge branch 'release/13.0.0'
2 parents 58e17f0 + d7d368f commit a7c866c

File tree

6 files changed

+11
-12
lines changed

6 files changed

+11
-12
lines changed

Directory.Build.props

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

Directory.Packages.props

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
</PropertyGroup>
55
<ItemGroup>
66
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
8-
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
9-
<GlobalPackageReference Include="Umbraco.Code" Version="2.0.0" />
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
8+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507" />
9+
<GlobalPackageReference Include="Umbraco.Code" Version="2.1.0" />
1010
<GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
11-
<GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" />
1211
</ItemGroup>
1312
<ItemGroup>
14-
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[12.0.0, 13)" />
15-
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[12.0.0, 13)" />
13+
<PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[13.0.0--preview.12, 14)" />
14+
<PackageVersion Include="Umbraco.Cms.Web.Website" Version="[13.0.0-rc4, 14)" />
1615
</ItemGroup>
1716
</Project>

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": "7.0.100",
3+
"version": "8.0.100-rc.2.23502.2",
44
"rollForward": "latestFeature"
55
}
66
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
exports.outputPath = '../obj/Debug/net7.0/clientassets'
1+
exports.outputPath = '../obj/Debug/net8.0/clientassets'

src/Umbraco.Commerce.Checkout/build/Microsoft.AspNetCore.ClientAssets.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<FileWrites Include="@(_ClientAssetsBuildOutput)" />
5959
<FileWrites Include="$(IntermediateOutputPath)clientassetsbuild.complete.txt" />
6060

61-
<Content Condition="'$(TargetFramework)' != 'net7.0'" Include="@(_ClientAssetsBuildOutput)" Link="wwwroot\%(_ClientAssetsBuildOutput.RecursiveDir)\%(_ClientAssetsBuildOutput.FileName)%(_ClientAssetsBuildOutput.Extension)" />
61+
<Content Condition="'$(TargetFramework)' != 'net8.0'" Include="@(_ClientAssetsBuildOutput)" Link="wwwroot\%(_ClientAssetsBuildOutput.RecursiveDir)\%(_ClientAssetsBuildOutput.FileName)%(_ClientAssetsBuildOutput.Extension)" />
6262
</ItemGroup>
6363

6464
<!--
@@ -67,7 +67,7 @@
6767
the ability to consume them from project references. As a workaround, we are using the Task directly on this package, to make sure this scenario works. In a future
6868
release we will address this by aligning DiscoverStaticWebAssets behavior with DefineStaticWebAssets to follow the same heuristics for determining the content root.
6969
-->
70-
<DefineStaticWebAssets Condition="'$(TargetFramework)' == 'net7.0'" CandidateAssets="@(_ClientAssetsBuildOutput)" SourceId="$(PackageId)" SourceType="Computed" ContentRoot="$(_ClientAssetsOutputFullPath)" BasePath="$(StaticWebAssetBasePath)">
70+
<DefineStaticWebAssets Condition="'$(TargetFramework)' == 'net8.0'" CandidateAssets="@(_ClientAssetsBuildOutput)" SourceId="$(PackageId)" SourceType="Computed" ContentRoot="$(_ClientAssetsOutputFullPath)" BasePath="$(StaticWebAssetBasePath)">
7171
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
7272
</DefineStaticWebAssets>
7373
</Target>

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "12.0.1",
3+
"version": "13.0.0",
44
"assemblyVersion": {
55
"precision": "build"
66
},

0 commit comments

Comments
 (0)