Merge pull request #1457 from SteveL-MSFT/3.2-p14

Update to version 3.2-preview.14, remove packaging.ps1 and copy_files.txt use

Author: SteveL-MSFT

.pipelines/DSC-Official.yml

@@ -4,8 +4,8 @@ trigger: none
 pr:
   branches:
     include:
-    - onebranch
     - release/v*
+    - test/*
 
 parameters:
   - name: OfficialBuild
@@ -88,7 +88,7 @@ extends:
           ob_sdl_codeql_compiled_enabled: false
         steps:
         - pwsh: |
-            $packageVersion = ./packaging.ps1 -GetPackageVersion
+            $packageVersion = ./build.ps1 -GetPackageVersion
             $vstsCommandString = "vso[task.setvariable variable=Version;isoutput=true]$packageVersion"
             Write-Host ("sending " + $vstsCommandString)
             Write-Host "##$vstsCommandString"
@@ -295,9 +295,9 @@ extends:
             apt update
             apt -y install musl-tools rpm dpkg build-essential protobuf-compiler
             ./build.ps1 -Release -Architecture x86_64-unknown-linux-musl
-            ./packaging.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
-            ./packaging.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
-            ./packaging.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
             Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
             Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
             Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -346,9 +346,9 @@ extends:
               $env:OPENSSL_LIB_DIR = $matches['dir']
             }
             ./build.ps1 -Release -Architecture aarch64-unknown-linux-musl
-            ./packaging.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
-            ./packaging.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
-            ./packaging.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
+            ./build.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
             Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
             Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
             Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -386,7 +386,7 @@ extends:
         - pwsh: |
             Write-Verbose -Verbose "Building for $(buildName)"
             ./build.ps1 -Release -Architecture $(buildName)
-            ./packaging.ps1 -PackageType tgz -Architecture $(buildName) -Release
+            ./build.ps1 -PackageType tgz -Architecture $(buildName) -Release
             Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
             Write-Host "##vso[artifact.upload containerfolder=release;artifactname=release]$(ob_outputDirectory)/DSC-$(PackageVersion)-$(buildName).tar.gz"
           displayName: 'Build $(buildName)'

.pipelines/DSC-Windows.yml

@@ -68,7 +68,7 @@ steps:
     TargetFolder: ./bin/${{ parameters.buildName }}/${{ parameters.BuildConfiguration }}
     OverWrite: true
 - pwsh: |
-    ./packaging.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
+    ./build.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
     Copy-Item ./bin/*.zip "$(Build.ArtifactStagingDirectory)" -Verbose
   displayName: 'Zip ${{ parameters.buildName }}'
 - pwsh: |

Cargo.lock

@@ -197,7 +197,7 @@ regex = { version = "1.12" }
 # registry, dsc-lib, dsc-lib-registry, dsctest
 registry = { version = "1.3" }
 # dsc
-rmcp = { version = "1.2" }
+rmcp = { version = "1.3" }
 # dsc_lib
 rt-format = { version = "0.3" }
 # dsc, dsc-lib, dsc-bicep-ext, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig
@@ -249,7 +249,7 @@ tree-sitter-rust = { version = "0.24" }
 # registry, dsc-lib-registry, dsctest
 utfx = { version = "0.1" }
 # dsc-lib
-uuid = { version = "1.22", features = ["v4"] }
+uuid = { version = "1.23", features = ["v4"] }
 # dsc-lib, dsc-lib-jsonschema
 url = { version = "2.5" }
 # dsc-lib, dsc-lib-jsonschema

Cargo.toml

@@ -55,6 +55,8 @@ using module ./helpers.build.psm1
     - `msix-private` - MSIX private package, requires a specific architecture.
     - `msixbundle` - MSIX bundle package, builds for both Windows targets.
     - `tgz` - Packages the project as a `.tar.gz` file, only for Linux/macOS.
+    - `deb` - Packages the project as a `.deb` file, only for Linux.
+    - `rpm` - Packages the project as a `.rpm` file, only for Linux.
     - `zip` - Packages the project as a `.zip` file, only for Windows.
 #>
 [CmdletBinding()]
@@ -75,9 +77,11 @@ param(
     [switch]$Clippy,
     [switch]$SkipBuild,
     [ValidateSet(
+        'deb',
         'msix',
         'msix-private',
         'msixbundle',
+        'rpm',
         'tgz',
         'zip'
     )]
@@ -110,6 +114,11 @@ begin {
         $ProgressPreference = 'SilentlyContinue'
     }
 
+    $progressParams = @{
+        Activity = "Executing build script"
+        Quiet    = $Quiet
+    }
+
     Import-Module ./helpers.build.psm1 -Force -Verbose:$false
     $usingADO = ($null -ne $env:TF_BUILD)
     if ($usingADO) {
@@ -164,10 +173,6 @@ process {
     if ($GetPackageVersion) {
         return Get-DscCliVersion @VerboseParam
     }
-    $progressParams = @{
-        Activity = "Executing build script"
-        Quiet    = $Quiet
-    }
     Write-BuildProgress @progressParams
 
     #region    Setup

adapters/powershell/copy_files.txt

@@ -1,6 +1,6 @@
 [package]
 name = "dsc"
-version = "3.2.0-preview.13"
+version = "3.2.0-preview.14"
 edition = "2024"
 
 [dependencies]