Updates to packaging for #1428 (#1489)

* Updates to packaging for #1428 * Disable dependency chain temporarily
2022-06-22 23:42:36 +10:00 · 2022-06-22 23:42:36 +10:00 · 95188ce73a
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -12,6 +12,10 @@
    },
    "editor.insertSpaces": true,
    "editor.tabSize": 4,
+    "[xml]": {
+        "editor.tabSize": 2,
+        "editor.formatOnSave": true
+    },
    "[yaml]": {
        "editor.tabSize": 2
    },
--- a/PSRule.Rules.Azure.sln
+++ b/PSRule.Rules.Azure.sln
@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PSRule.Rules.Azure.Benchmar
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PSRule.Rules.Azure.BuildTool", "src\PSRule.Rules.Azure.BuildTool\PSRule.Rules.Azure.BuildTool.csproj", "{218B2D45-A2BD-4966-9B9F-4064CD68BA8A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDK", "src\SDK\SDK.csproj", "{53ADEBBE-8CFD-43E0-B423-4D9DFE6222AD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -36,6 +38,10 @@ Global
 		{218B2D45-A2BD-4966-9B9F-4064CD68BA8A}.Debug|Any CPU.Build.0 = Release|Any CPU
 		{218B2D45-A2BD-4966-9B9F-4064CD68BA8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{218B2D45-A2BD-4966-9B9F-4064CD68BA8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53ADEBBE-8CFD-43E0-B423-4D9DFE6222AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53ADEBBE-8CFD-43E0-B423-4D9DFE6222AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53ADEBBE-8CFD-43E0-B423-4D9DFE6222AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53ADEBBE-8CFD-43E0-B423-4D9DFE6222AD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/src/PSRule.Common.props
+++ b/src/PSRule.Common.props
@ -0,0 +1,54 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Project defaults -->
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <NeutralLanguage>en-US</NeutralLanguage>
+  </PropertyGroup>
+
+  <!-- Package metadata -->
+  <PropertyGroup>
+    <Title>PSRule for Azure</Title>
+    <Authors>Microsoft</Authors>
+    <AssemblyTitle>PSRule for Azure</AssemblyTitle>
+    <RepositoryUrl>https://github.com/Azure/PSRule.Rules.Azure</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageProjectUrl>https://aka.ms/ps-rule-azure</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Version>0.0.1</Version>
+    <Company>Microsoft Corporation</Company>
+    <Copyright>&#169; Microsoft Corporation. All rights reserved.</Copyright>
+    <Description>Validate Azure resources and infrastructure as code using PSRule.
+
+This project uses GitHub Issues to track bugs and feature requests. See GitHub project for more information.</Description>
+    <PackageReleaseNotes>For a list of changes see https://aka.ms/ps-rule-azure/changelog.</PackageReleaseNotes>
+    <PackageIcon>package_icon.png</PackageIcon>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+    <DefineConstants>Windows</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\docs\assets\package_icon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(PackageReadmeFile)' != ''">
+    <None Include="README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+</Project>
--- a/src/PSRule.Rules.Azure.BuildTool/PSRule.Rules.Azure.BuildTool.csproj
+++ b/src/PSRule.Rules.Azure.BuildTool/PSRule.Rules.Azure.BuildTool.csproj
@ -1,35 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\PSRule.Common.props" />
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp3.1</TargetFramework>
    <ProjectGuid>{218b2d45-a2bd-4966-9b9f-4064cd68ba8a}</ProjectGuid>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <Authors>Bernie White</Authors>
-    <AssemblyTitle>PSRule for Azure Build Tool</AssemblyTitle>
-    <RepositoryUrl>https://github.com/Azure/PSRule.Rules.Azure</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageProjectUrl>https://aka.ms/ps-rule-azure</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <EnableNuget>false</EnableNuget>
    <IsPackable>false</IsPackable>
-    <Version>0.0.1</Version>
-    <Company>Microsoft Corporation</Company>
-    <Copyright>Copyright (c) Microsoft Corporation. Licensed under the MIT License.</Copyright>
-    <Description>Tools for building PSRule for Azure.
-
-This project uses GitHub Issues to track bugs and feature requests. See GitHub project for more information.</Description>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
-    <DefineConstants>Windows</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
  </PropertyGroup>

  <ItemGroup>
--- a/src/PSRule.Rules.Azure/PSRule.Rules.Azure-nodeps.psd1
+++ b/src/PSRule.Rules.Azure/PSRule.Rules.Azure-nodeps.psd1
@ -62,7 +62,7 @@ This project uses GitHub Issues to track bugs and feature requests. See GitHub p

    # Assemblies that must be loaded prior to importing this module
    RequiredAssemblies     = @(
-        'Azure.PSRule.dll'
+        'Microsoft.PSRule.Rules.Azure.Core.dll'
    )

    # Script files (.ps1) that are run in the caller's environment prior to importing this module.
--- a/src/PSRule.Rules.Azure/PSRule.Rules.Azure.csproj
+++ b/src/PSRule.Rules.Azure/PSRule.Rules.Azure.csproj
@ -1,32 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
+  <Import Project="..\PSRule.Common.props" />
  <PropertyGroup>
-    <AssemblyName>Azure.PSRule</AssemblyName>
+    <AssemblyName>Microsoft.PSRule.Rules.Azure.Core</AssemblyName>
    <RootNamespace>PSRule.Rules.Azure</RootNamespace>
-    <TargetFramework>netstandard2.0</TargetFramework>
    <LangVersion>9.0</LangVersion>
    <OutputType>Library</OutputType>
    <ProjectGuid>{bce66f73-3809-4740-b3c3-f52958e7ab51}</ProjectGuid>
-    <NeutralLanguage>en-US</NeutralLanguage>
    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
    <!-- <TreatWarningsAsErrors>true</TreatWarningsAsErrors> -->
-    <Authors>Bernie White</Authors>
-    <AssemblyTitle>PSRule for Azure</AssemblyTitle>
-    <RepositoryUrl>https://github.com/Azure/PSRule.Rules.Azure</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageProjectUrl>https://aka.ms/ps-rule-azure</PackageProjectUrl>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageId>Azure.PSRule</PackageId>
-    <PackageTags>PSRule;</PackageTags>
-    <EnableNuget>true</EnableNuget>
-    <Version>0.0.1</Version>
-    <Company>Microsoft Corporation</Company>
-    <Copyright>Copyright (c) Microsoft Corporation. Licensed under the MIT License.</Copyright>
-    <Description>Validate Azure resources and infrastructure as code using PSRule.

-This project uses GitHub Issues to track bugs and feature requests. See GitHub project for more information.</Description>
-    <PackageReleaseNotes>For a list of changes see https://aka.ms/ps-rule-azure/changelog.</PackageReleaseNotes>
-    <PackageIcon>package_icon.png</PackageIcon>
+    <PackageId>Microsoft.PSRule.Rules.Azure.Core</PackageId>
+    <EnableNuget>true</EnableNuget>
    <PackageReadmeFile>README.md</PackageReadmeFile>
  </PropertyGroup>

@ -42,28 +26,35 @@ This project uses GitHub Issues to track bugs and feature requests. See GitHub p
    <DebugSymbols>true</DebugSymbols>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
-    <DefineConstants>Windows</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="..\..\docs\assets\package_icon.png">
+  <!-- <ItemGroup>
+    <None Include="..\..\docs\en\rules\*.md" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest">
      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
+      <PackagePath>en\</PackagePath>
+      <LinkBase>en\</LinkBase>
    </None>
-    <None Include="README.md">
+    <None Include="rules\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest">
      <Pack>True</Pack>
-      <PackagePath>\</PackagePath>
+      <PackagePath>\rules\</PackagePath>
+      <LinkBase>docs\</LinkBase>
    </None>
-  </ItemGroup>
+  </ItemGroup> -->
+  <!-- <ItemGroup>
+    <Content Include="*.psd1;">
+      <Link>Modulues\PSRule.Rules.Azure\%(RecursiveDir)\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="rules\*">
+      <Link>rules\%(RecursiveDir)\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="..\..\docs\en\rules\*.md">
+      <Link>en\%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup> -->

  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
@ -146,7 +137,7 @@ This project uses GitHub Issues to track bugs and feature requests. See GitHub p
  </UsingTask>

  <Target Name="BuildTool">
-    <Exec Command="dotnet run --project ./src/PSRule.Rules.Azure.BuildTool -- provider" WorkingDirectory="..\.." ConsoleToMSBuild="true" >
+    <Exec Command="dotnet run --project ./src/PSRule.Rules.Azure.BuildTool -- provider" WorkingDirectory="..\.." ConsoleToMSBuild="true">
      <Output TaskParameter="ConsoleOutput" PropertyName="OutputOfExec" />
    </Exec>
  </Target>
--- a/src/PSRule.Rules.Azure/PSRule.Rules.Azure.psd1
+++ b/src/PSRule.Rules.Azure/PSRule.Rules.Azure.psd1
@ -57,7 +57,7 @@ This project uses GitHub Issues to track bugs and feature requests. See GitHub p

    # Assemblies that must be loaded prior to importing this module
    RequiredAssemblies     = @(
-        'Azure.PSRule.dll'
+        'Microsoft.PSRule.Rules.Azure.Core.dll'
    )

    # Script files (.ps1) that are run in the caller's environment prior to importing this module.
--- a/src/SDK/README.md
+++ b/src/SDK/README.md
@ -0,0 +1,3 @@
+# PSRule for Azure
+
+This package contains rules for evaluating Azure Infrastructure as Code (IaC) using PSRule.
--- a/src/SDK/SDK.csproj
+++ b/src/SDK/SDK.csproj
@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\PSRule.Common.props" />
+  <PropertyGroup>
+    <PackageId>Microsoft.PSRule.Rules.Azure</PackageId>
+    <EnableNuget>true</EnableNuget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PSRule.Rules.Azure\PSRule.Rules.Azure.csproj" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="..\PSRule.Rules.Azure\*.psd1;">
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <PackagePath>contentFiles\any\any\Modules\PSRule.Rules.Azure\;content\Modules\PSRule.Rules.Azure\</PackagePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="..\PSRule.Rules.Azure\rules\*">
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <PackagePath>contentFiles\any\any\Modules\PSRule.Rules.Azure\rules\;content\Modules\PSRule.Rules.Azure\rules\</PackagePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="..\..\docs\en\rules\*.md">
+      <PackageCopyToOutput>true</PackageCopyToOutput>
+      <PackagePath>contentFiles\any\any\Modules\PSRule.Rules.Azure\en\;content\Modules\PSRule.Rules.Azure\en\</PackagePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+
+    <Content Include="$(OutputPath)\Microsoft.PSRule.Rules.Azure.Core.dll">
+      <Pack>true</Pack>
+      <PackagePath>contentFiles\any\any\Modules\PSRule.Rules.Azure\;content\Modules\PSRule.Rules.Azure\</PackagePath>
+    </Content>
+  </ItemGroup>
+
+  <!-- <ItemGroup>
+    <PackageReference Include="Microsoft.PSRule.SDK" Version="0.0.1" />
+  </ItemGroup> -->
+</Project>