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

Merge remote-tracking branch 'origin/v11/dev' into v12/dev

Browse Source
This commit is contained in:
Bjarke Berg
2023-12-22 14:10:33 +01:00
parent 4489cf45d1 b0c5101b2b
commit 3538737681
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/Umbraco.Templates.csproj
View File

@@ -46,11 +46,11 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<!-- Update template.json files with the default UmbracoVersion value set to the current build version --> <!-- Update template.json files with the default UmbracoVersion value set to the current build version -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" /> <PackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
</ItemGroup> </ItemGroup>
<Target Name="GetUpdatedTemplateJsonPackageFiles" BeforeTargets="GenerateNuspec" AfterTargets="GetBuildVersion;GetUmbracoBuildVersion">
<ItemGroup> <ItemGroup>
<Content Update="**\.template.config\template.json" Pack="false" /> <Content Update="**\.template.config\template.json" Pack="false" />
</ItemGroup> </ItemGroup>
@@ -64,12 +64,9 @@
<Copy SourceFiles="@(_TemplateJsonFiles)" DestinationFiles="%(DestinationFile)" /> <Copy SourceFiles="@(_TemplateJsonFiles)" DestinationFiles="%(DestinationFile)" />
<JsonPathUpdateValue JsonFile="%(_TemplateJsonFiles.DestinationFile)" Path="$.symbols.UmbracoVersion.defaultValue" Value="&quot;$(PackageVersion)&quot;" /> <JsonPathUpdateValue JsonFile="%(_TemplateJsonFiles.DestinationFile)" Path="$.symbols.UmbracoVersion.defaultValue" Value="&quot;$(PackageVersion)&quot;" />
<ItemGroup> <ItemGroup>
<_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)">
<PackagePath>%(RelativeDir)</PackagePath>
<_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)"> <_PackageFiles Include="%(_TemplateJsonFiles.DestinationFile)">
<PackagePath>%(_TemplateJsonFiles.RelativeDir)</PackagePath> <PackagePath>%(_TemplateJsonFiles.RelativeDir)</PackagePath>
</_PackageFiles> </_PackageFiles>
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>