Convert to RCL with embedded umbraco-package.json

Author: mattbrailsford

Directory.Packages.props

@@ -5,9 +5,9 @@
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
-    <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435" />
     <GlobalPackageReference Include="Umbraco.Code" Version="2.2.0" />
     <GlobalPackageReference Include="Umbraco.GitVersioning.Extensions" Version="0.2.0" />
+    <GlobalPackageReference Include="Umbraco.JsonSchema.Extensions" Version="0.3.0" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <PackageVersion Include="Umbraco.Commerce.Cms.Startup" Version="[14.0.0-rc2, 15)" />

src/Umbraco.Commerce.Deploy/Umbraco.Commerce.Deploy.csproj

@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
     <PropertyGroup>
         <Title>Umbraco Commerce Deploy</Title>
         <Description>Umbraco Commerce Deploy</Description>
+      <StaticWebAssetBasePath>App_Plugins/UmbracoCommerceDeploy</StaticWebAssetBasePath>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -11,11 +12,22 @@
         <PackageReference Include="Umbraco.Deploy.Infrastructure" />
     </ItemGroup>
 
-    <!-- Workaround for this bug (replace the analyzer name with the one you need to exclude (filename only, no extension) -->
-<!--    <Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">-->
-<!--        <ItemGroup>-->
-<!--            <Analyzer Remove="@(Analyzer)" Condition="%(FileName) == 'Lucene.Net.CodeAnalysis.CSharp'" />-->
-<!--        </ItemGroup>-->
-<!--    </Target>-->
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <!-- Update umbraco-package.json files with current build version -->
+  <!-- Assumes that the client assets have already been built to wwwroot -->
+  <Target Name="UpdatePackageManifestVersion" BeforeTargets="BeforeBuild" DependsOnTargets="GetBuildVersion;GetUmbracoBuildVersion" Condition="Exists('wwwroot\umbraco-package.json')">
+    <Message Text="Update umbraco-package.json files with current build version" Importance="high" />
+    <ItemGroup>
+      <_PackageManifestFiles Include="wwwroot\umbraco-package.json" />
+    </ItemGroup>
+    <JsonPathUpdateValue JsonFile="%(_PackageManifestFiles.FullPath)" Path="$.version" Value="&quot;$(PackageVersion)&quot;" />
+  </Target>
 
 </Project>

src/Umbraco.Commerce.Deploy/UmbracoCommerceDeployComposer.cs

@@ -18,15 +18,6 @@
         "resolved": "3.5.119",
         "contentHash": "x8k4zV6YKZA5Rr810439lG9NngdbyPtFv0QpIYz32m1Im59kvSbEHO8gKGZoNvsfZSquayjEDUCa8acbut372g=="
       },
-      "StyleCop.Analyzers": {
-        "type": "Direct",
-        "requested": "[1.2.0-beta.435, )",
-        "resolved": "1.2.0-beta.435",
-        "contentHash": "TADk7vdGXtfTnYCV7GyleaaRTQjfoSfZXprQrVMm7cSJtJbFc1QIbWPyLvrgrfGdfHbGmUPvaN4ODKNxg2jgPQ==",
-        "dependencies": {
-          "StyleCop.Analyzers.Unstable": "1.2.0.435"
-        }
-      },
       "Umbraco.Code": {
         "type": "Direct",
         "requested": "[2.2.0, )",
@@ -74,6 +65,12 @@
         "resolved": "0.2.0",
         "contentHash": "m85a1RWGllvZxhw4SfnNyHszN9WDqQk6WGpR0Fzu2ZwEHCPesQPc+7NDl/PgUrVLyLDA9HqAasb2NEHqPffaCQ=="
       },
+      "Umbraco.JsonSchema.Extensions": {
+        "type": "Direct",
+        "requested": "[0.3.0, )",
+        "resolved": "0.3.0",
+        "contentHash": "pvgnrC9vQ/3GvYvAwhLHvqwMgyvndHtKi+io77cMNuY+e/eR0eBV5SyzXmW5q3MFnbV4AizdjZIsuoMszY7mxA=="
+      },
       "Asp.Versioning.Abstractions": {
         "type": "Transitive",
         "resolved": "8.1.0",
@@ -1974,11 +1971,6 @@
           "System.Collections.Concurrent": "4.3.0"
         }
       },
-      "StyleCop.Analyzers.Unstable": {
-        "type": "Transitive",
-        "resolved": "1.2.0.435",
-        "contentHash": "ouwPWZxbOV3SmCZxIRqHvljkSzkCyi1tDoMzQtDb/bRP8ctASV/iRJr+A2Gdj0QLaLmWnqTWDrH82/iP+X80Lg=="
-      },
       "Swashbuckle.AspNetCore": {
         "type": "Transitive",
         "resolved": "6.6.2",

src/Umbraco.Commerce.Deploy/UmbracoCommerceDeployManifestFilter.cs

@@ -0,0 +1,6 @@
+{
+  "id": "Umbraco.Commerce.Deploy",
+  "name": "Umbraco Commerce Deploy",
+  "version": "14.0.0--beta1.preview.2.ge66d399",
+  "allowPackageTelemetry": true
+}