v9: 11419 Remove Azure gallery from build.ps1 (#11540)

* Fix build.ps1 & change order of itemgroup in csproj

* Fix merge conflict

* Update package version

Co-authored-by: Nikolaj Geisle <[email protected]>
Co-authored-by: Elitsa Marinovska <[email protected]>

Author: 3 people

build/build.ps1

@@ -449,12 +449,6 @@
     if ($this.OnError()) { return }
   })
 
-  $ubuild.DefineMethod("PrepareAzureGallery",
-  {
-    Write-Host "Prepare Azure Gallery"
-    $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
-  })
-
   $ubuild.DefineMethod("PrepareCSharpDocs",
   {
     Write-Host "Prepare C# Documentation"
@@ -528,8 +522,6 @@
     if ($this.OnError()) { return }
     $this.PackageNuGet()
     if ($this.OnError()) { return }
-    $this.PrepareAzureGallery()
-    if ($this.OnError()) { return }
     $this.PostPackageHook()
     if ($this.OnError()) { return }
 

build/templates/UmbracoProject/UmbracoProject.csproj

@@ -1,25 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI</RootNamespace>
     </PropertyGroup>
 
-
     <ItemGroup>
         <PackageReference Include="Umbraco.Cms" Version="UMBRACO_VERSION_FROM_TEMPLATE" />
         <PackageReference Include="Umbraco.Cms.SqlCe" Version="UMBRACO_VERSION_FROM_TEMPLATE" Condition="'$(UseSqlCe)' == 'true'" />
         <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" Condition="'$(UseSqlCe)' == 'true'" />
     </ItemGroup>
 
-  <!-- Force windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older windows 10 and most if not all winodws servers will run NLS -->
-  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
-    <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
-    <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
-  </ItemGroup>
-
+    <!-- Force windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older windows 10 and most if not all winodws servers will run NLS -->
+    <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+        <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.9" />
+        <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
+    </ItemGroup>
 
-  <Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''" />
+    <Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''" />
 
     <ItemGroup Condition="'$(PackageTestSiteName)' != ''">
         <ProjectReference Include="..\PackageTestSiteName\PackageTestSiteName.csproj" />