Skip to content

Commit 9171303

Browse files
committed
Update to version 3.2-preview.14, remove packaging.ps1 and copy_files.txt use
1 parent 1070169 commit 9171303

18 files changed

Lines changed: 24 additions & 1064 deletions

File tree

.pipelines/DSC-Official.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ extends:
8888
ob_sdl_codeql_compiled_enabled: false
8989
steps:
9090
- pwsh: |
91-
$packageVersion = ./packaging.ps1 -GetPackageVersion
91+
$packageVersion = ./build.ps1 -GetPackageVersion
9292
$vstsCommandString = "vso[task.setvariable variable=Version;isoutput=true]$packageVersion"
9393
Write-Host ("sending " + $vstsCommandString)
9494
Write-Host "##$vstsCommandString"
@@ -295,9 +295,9 @@ extends:
295295
apt update
296296
apt -y install musl-tools rpm dpkg build-essential protobuf-compiler
297297
./build.ps1 -Release -Architecture x86_64-unknown-linux-musl
298-
./packaging.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
299-
./packaging.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
300-
./packaging.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
298+
./build.ps1 -PackageType tgz -Architecture x86_64-unknown-linux-musl -Release
299+
./build.ps1 -PackageType rpm -Architecture x86_64-unknown-linux-musl -Release
300+
./build.ps1 -PackageType deb -Architecture x86_64-unknown-linux-musl -Release
301301
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
302302
Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
303303
Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -346,9 +346,9 @@ extends:
346346
$env:OPENSSL_LIB_DIR = $matches['dir']
347347
}
348348
./build.ps1 -Release -Architecture aarch64-unknown-linux-musl
349-
./packaging.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
350-
./packaging.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
351-
./packaging.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
349+
./build.ps1 -PackageType tgz -Architecture aarch64-unknown-linux-musl -Release
350+
./build.ps1 -PackageType rpm -Architecture aarch64-unknown-linux-musl -Release
351+
./build.ps1 -PackageType deb -Architecture aarch64-unknown-linux-musl -Release
352352
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
353353
Copy-Item ./bin/*.rpm "$(ob_outputDirectory)"
354354
Copy-Item ./bin/*.deb "$(ob_outputDirectory)"
@@ -386,7 +386,7 @@ extends:
386386
- pwsh: |
387387
Write-Verbose -Verbose "Building for $(buildName)"
388388
./build.ps1 -Release -Architecture $(buildName)
389-
./packaging.ps1 -PackageType tgz -Architecture $(buildName) -Release
389+
./build.ps1 -PackageType tgz -Architecture $(buildName) -Release
390390
Copy-Item ./bin/*.tar.gz "$(ob_outputDirectory)"
391391
Write-Host "##vso[artifact.upload containerfolder=release;artifactname=release]$(ob_outputDirectory)/DSC-$(PackageVersion)-$(buildName).tar.gz"
392392
displayName: 'Build $(buildName)'

.pipelines/DSC-Windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ steps:
6868
TargetFolder: ./bin/${{ parameters.buildName }}/${{ parameters.BuildConfiguration }}
6969
OverWrite: true
7070
- pwsh: |
71-
./packaging.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
71+
./build.ps1 -PackageType zip -Architecture ${{ parameters.buildName }} -Release
7272
Copy-Item ./bin/*.zip "$(Build.ArtifactStagingDirectory)" -Verbose
7373
displayName: 'Zip ${{ parameters.buildName }}'
7474
- pwsh: |

Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ regex = { version = "1.12" }
197197
# registry, dsc-lib, dsc-lib-registry, dsctest
198198
registry = { version = "1.3" }
199199
# dsc
200-
rmcp = { version = "1.2" }
200+
rmcp = { version = "1.3" }
201201
# dsc_lib
202202
rt-format = { version = "0.3" }
203203
# dsc, dsc-lib, dsc-bicep-ext, dscecho, registry, dsc-lib-registry, runcommandonset, sshdconfig
@@ -249,7 +249,7 @@ tree-sitter-rust = { version = "0.24" }
249249
# registry, dsc-lib-registry, dsctest
250250
utfx = { version = "0.1" }
251251
# dsc-lib
252-
uuid = { version = "1.22", features = ["v4"] }
252+
uuid = { version = "1.23", features = ["v4"] }
253253
# dsc-lib, dsc-lib-jsonschema
254254
url = { version = "2.5" }
255255
# dsc-lib, dsc-lib-jsonschema

adapters/powershell/copy_files.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

adapters/wmi/copy_files.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

build.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ begin {
110110
$ProgressPreference = 'SilentlyContinue'
111111
}
112112

113+
$progressParams = @{
114+
Activity = "Executing build script"
115+
Quiet = $Quiet
116+
}
117+
113118
Import-Module ./helpers.build.psm1 -Force -Verbose:$false
114119
$usingADO = ($null -ne $env:TF_BUILD)
115120
if ($usingADO) {
@@ -164,10 +169,6 @@ process {
164169
if ($GetPackageVersion) {
165170
return Get-DscCliVersion @VerboseParam
166171
}
167-
$progressParams = @{
168-
Activity = "Executing build script"
169-
Quiet = $Quiet
170-
}
171172
Write-BuildProgress @progressParams
172173

173174
#region Setup

configurations/windows/copy_files.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

copy_files.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

dsc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "dsc"
3-
version = "3.2.0-preview.13"
3+
version = "3.2.0-preview.14"
44
edition = "2024"
55

66
[dependencies]

0 commit comments

Comments
 (0)