Merge remote-tracking branch 'origin/v9/9.1' into v9/dev

umbraco · Nov 22, 2021 · 1048190 · 1048190
2 parents 8fd0138 + b58a0cf
commit 1048190
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets b/build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets
@@ -33,14 +33,15 @@
             SkipUnchangedFiles="true" />
     </Target>
 
-    <Target Name="IncludeAppPluginsContent" BeforeTargets="GetCopyToOutputDirectoryItems">
+    <Target Name="IncludeAppPluginsContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
         <ItemGroup>
             <_AppPluginsFiles Include="App_Plugins\**" />
 
             <ContentWithTargetPath
                 Include="@(_AppPluginsFiles)"
                 TargetPath="%(Identity)"
-                CopyToOutputDirectory="Always" />
+                CopyToOutputDirectory="PreserveNewest"
+                CopyToPublishDirectory="PreserveNewest"/>
         </ItemGroup>
     </Target>
 
@@ -49,7 +50,7 @@
         A fix was put in place in Web SDK to update for wwwwroot in case someone runs npm build etc in a target, we're borrowing their trick.
         https://github.com/dotnet/sdk/blob/e2b2b1a4ac56c955b84d62fe71cda3b6f258b42b/src/WebSdk/Publish/Targets/ComputeTargets/Microsoft.NET.Sdk.Publish.ComputeFiles.targets
      -->
-    <Target Name="IncludeUmbracoFolderContent" BeforeTargets="GetCopyToOutputDirectoryItems">
+    <Target Name="IncludeUmbracoFolderContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
         <ItemGroup>
             <_UmbracoFolderFiles Include="umbraco\config\**" />
             <_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" />
@@ -65,10 +66,12 @@
             <ContentWithTargetPath
                 Include="@(_UmbracoFolderFiles)"
                 TargetPath="%(Identity)"
-                CopyToOutputDirectory="Always" />
+                CopyToOutputDirectory="PreserveNewest"
+                CopyToPublishDirectory="PreserveNewest"/>
         </ItemGroup>
     </Target>
 
+
     <Target Name="ClearUmbracoAssets" BeforeTargets="Clean">
         <ItemGroup>
             <UmbracoConfigPackageDir Include="$(MSBuildProjectDirectory)\umbraco\config\" />

diff --git a/build/templates/UmbracoPackage/.template.config/template.json b/build/templates/UmbracoPackage/.template.config/template.json
@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.1.0",
+            "defaultValue": "9.1.1",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

diff --git a/build/templates/UmbracoProject/.template.config/template.json b/build/templates/UmbracoProject/.template.config/template.json
@@ -57,7 +57,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.1.0",
+            "defaultValue": "9.1.1",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,10 +3,10 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <Version>9.1.0</Version>
-    <AssemblyVersion>9.1.0</AssemblyVersion>
-    <InformationalVersion>9.1.0</InformationalVersion>
-    <FileVersion>9.1.0</FileVersion>
+    <Version>9.1.1</Version>
+    <AssemblyVersion>9.1.1</AssemblyVersion>
+    <InformationalVersion>9.1.1</InformationalVersion>
+    <FileVersion>9.1.1</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Company>Umbraco CMS</Company>