Fix build system

Azure · Nov 28, 2023 · d4c8bb0 · d4c8bb0
1 parent 381b739
commit d4c8bb0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/readme.md b/readme.md
@@ -37,7 +37,7 @@ Our releases are tagged following semantic versioning (“semver”) conventions
 |--------------------|--------------------|----------------|-----------------------|---------------------|
 | Industrial IoT 2.8 | [2.8.6](https://github.com/Azure/Industrial-IoT/tree/release/2.8.6) | 7/15/2023  | OPC Publisher 2.9 | [Migration Path](docs/opc-publisher/migrationpath.md) |
 | OPC Publisher 2.8  | [2.8.7](https://github.com/Azure/Industrial-IoT/tree/release/2.8.7) | 12/15/2023 | OPC Publisher 2.9 | N/A |
-| OPC Publisher 2.9  | [2.9.2](https://github.com/Azure/Industrial-IoT/tree/release/2.9.2) | 11/1/2026  | TBA               | [Migration Path](docs/opc-publisher/migrationpath.md) |
+| OPC Publisher 2.9  | [2.9.2](https://github.com/Azure/Industrial-IoT/tree/release/2.9.2) | 11/10/2026 | TBA               | [Migration Path](docs/opc-publisher/migrationpath.md) |
 
 We only support the latest patch version of a release which per semantic versioning convention is identified by the 3rd part of the version string. Preview releases, preview and experimental features are only supported through GitHub issues.
 

diff --git a/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj b/src/Azure.IIoT.OpcUa.Publisher.Service.Sdk/cli/Azure.IIoT.OpcUa.Publisher.Service.Cli.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <PublishProfile>DefaultContainer</PublishProfile>
-    <ContainerImageName>iot/industrial-cli</ContainerImageName>
+    <ContainerRepository>iot/industrial-cli</ContainerRepository>
     <ContainerRuntimeIdentifier>linux-x64</ContainerRuntimeIdentifier>
     <ContainerBaseImage>mcr.microsoft.com/dotnet/runtime:8.0-cbl-mariner2.0-distroless</ContainerBaseImage>
   </PropertyGroup>

diff --git a/....IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj b/....IIoT.OpcUa.Publisher.Service.WebApi/src/Azure.IIoT.OpcUa.Publisher.Service.WebApi.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <PublishProfile>DefaultContainer</PublishProfile>
-    <ContainerImageName>iot/industrial-iot-services-all</ContainerImageName>
+    <ContainerRepository>iot/industrial-iot-services-all</ContainerRepository>
     <ContainerBaseImage>mcr.microsoft.com/dotnet/aspnet:8.0-cbl-mariner2.0-distroless</ContainerBaseImage>
   </PropertyGroup>
   <ItemGroup>

diff --git a/tools/scripts/build.ps1 b/tools/scripts/build.ps1
@@ -112,7 +112,7 @@ try {
     Get-ChildItem $Path -Filter *.csproj -Recurse | ForEach-Object {
         $projFile = $_
         $properties = ([xml] (Get-Content -Path $projFile.FullName)).Project.PropertyGroup `
-            | Where-Object { ![string]::IsNullOrWhiteSpace($_.ContainerImageName) } `
+            | Where-Object { ![string]::IsNullOrWhiteSpace($_.ContainerRepository) } `
             | Select-Object -First 1
         if ($properties) {
             $fullName = ""
@@ -122,7 +122,7 @@ try {
             if ($script:ImageNamespace) {
                 $fullName = "$($fullName)$($script:ImageNamespace)/"
             }
-            $fullName = "$($fullName)$($properties.ContainerImageName)"
+            $fullName = "$($fullName)$($properties.ContainerRepository)"
             $tagPostfix = ""
             if ($script:Debug.IsPresent) {
                 $tagPostfix = "-debug"

diff --git a/tools/scripts/publish.ps1 b/tools/scripts/publish.ps1
@@ -51,7 +51,7 @@ $env:SDK_CONTAINER_REGISTRY_PARALLEL_UPLOAD = $false
 Get-ChildItem $Path -Filter *.csproj -Recurse | ForEach-Object {
     $projFile = $_
     $properties = ([xml] (Get-Content -Path $projFile.FullName)).Project.PropertyGroup `
-        | Where-Object { ![string]::IsNullOrWhiteSpace($_.ContainerImageName) } `
+        | Where-Object { ![string]::IsNullOrWhiteSpace($_.ContainerRepository) } `
         | Select-Object -First 1
     if ($properties) {
         $fullName = ""
@@ -62,7 +62,7 @@ Get-ChildItem $Path -Filter *.csproj -Recurse | ForEach-Object {
         if ($script:ImageNamespace) {
             $fullName = "$($fullName)$($script:ImageNamespace)/"
         }
-        $fullName = "$($fullName)$($properties.ContainerImageName)"
+        $fullName = "$($fullName)$($properties.ContainerRepository)"
 
         $fullTag = "$($script:ImageTag)-$($script:Os)-$($script:Arch)"
         if ($script:Debug.IsPresent) {
@@ -77,7 +77,7 @@ Get-ChildItem $Path -Filter *.csproj -Recurse | ForEach-Object {
 
         dotnet publish $projFile.FullName -c $configuration --self-contained false `
             /p:TargetLatestRuntimePatch=true `
-            /p:ContainerImageName=$fullName `
+            /p:ContainerRepository=$fullName `
             /p:ContainerImageTag=$fullTag `
             /t:PublishContainer $extra
         if ($LastExitCode -ne 0) {