Merge remote-tracking branch 'origin/release/15.1' into v15/dev

yiangos · Nov 29, 2024 · d1d2d73 · d1d2d73
2 parents 428c917 + 3203f64
commit d1d2d73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/templates/Umbraco.Templates.csproj b/templates/Umbraco.Templates.csproj
@@ -11,7 +11,7 @@
     <ContentTargetFolders>.</ContentTargetFolders>
     <NoWarn>$(NoWarn),NU5128</NoWarn>
   </PropertyGroup>
-  
+
   <!-- Added project references as the sample API in umbraco-extension will fail -->
   <ItemGroup>
     <ProjectReference Include="..\src\Umbraco.Cms.Api.Common\Umbraco.Cms.Api.Common.csproj" />
@@ -24,9 +24,7 @@
   <ItemGroup>
     <PackageReference Include="Umbraco.JsonSchema.Extensions" PrivateAssets="all" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Update="**\.template.config\template.json" Pack="false" />
-  </ItemGroup>
+
   <Target Name="GetUpdatedTemplateJsonPackageFiles" BeforeTargets="GenerateNuspec" AfterTargets="GetUmbracoBuildVersion">
     <ItemGroup>
       <_TemplateJsonFiles Include="**\.template.config\template.json" Exclude="bin\**;obj\**" />
@@ -64,4 +62,8 @@
       <PackagePath>UmbracoProject\Views</PackagePath>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="**\.template.config\template.json" Pack="false" />
+  </ItemGroup>
 </Project>
diff --git a/templates/UmbracoProject/.template.config/template.json b/templates/UmbracoProject/.template.config/template.json
@@ -94,7 +94,7 @@
         "cases": [
           {
             "condition": "(UmbracoRelease == 'Latest')",
-            "value": "15.1.0-rc"
+            "value": "*"
           },
           {
             "condition": "(UmbracoRelease == 'LTS')",

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "15.1.0-rc",
+  "version": "15.1.0-rc2",
   "assemblyVersion": {
     "precision": "build"
   },