Fix .NET SDK version.

Author: randy-armstrong

.github/workflows/docker-image.yml

@@ -29,10 +29,10 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Set up .NET 8.0
+    - name: Set up .NET 9.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.x'
+        dotnet-version: '9.x'
 
     # Install the cosign tool except on PR
     # https://github.com/sigstore/cosign-installer

Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 WORKDIR /source
 
 # copy csproj and restore as distinct layers
@@ -7,10 +7,10 @@ RUN dotnet restore "ModelCompiler.sln"
 
 # copy and publish app and libraries
 COPY . .
-RUN dotnet publish "ModelCompiler.sln" -f net8.0 -c Docker -o /app
+RUN dotnet publish "ModelCompiler.sln" -f net9.0 -c Docker -o /app
 
 # final stage/image
-FROM mcr.microsoft.com/dotnet/runtime:8.0
+FROM mcr.microsoft.com/dotnet/runtime:9.0
 WORKDIR /app
 COPY --from=build /app .
 ENTRYPOINT ["dotnet", "/app/Opc.Ua.ModelCompiler.dll"]

Opc.Ua.ModelCompiler/Opc.Ua.ModelCompiler.Debug.csproj

@@ -327,35 +327,20 @@
 
   <ItemGroup>
     <EmbeddedResource Include="CSVs\DemoModel.csv" />
-    <EmbeddedResource Include="CSVs\MDIS.csv" />
-    <EmbeddedResource Include="CSVs\MTConnectModel.csv" />
-    <EmbeddedResource Include="CSVs\OpcUaAdiModel.csv" />
     <EmbeddedResource Include="CSVs\OpcUaDiModel.csv" />
-    <EmbeddedResource Include="CSVs\OpcUaFdiPart5Model.csv" />
-    <EmbeddedResource Include="CSVs\OpcUaFdiPart7Model.csv" />
     <EmbeddedResource Include="CSVs\OpcUaGdsModel.csv" />
-    <EmbeddedResource Include="CSVs\OpcUaNodeSetModel.csv" />
-    <EmbeddedResource Include="CSVs\OpcUaPLCopenModel.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a1.csv" />
     <EmbeddedResource Include="CSVs\rec20_latest_a2-3.csv" />
-    <EmbeddedResource Include="CSVs\SercosModel.csv" />
     <EmbeddedResource Include="CSVs\StandardTypes.csv" />
     <EmbeddedResource Include="CSVs\Attributes.csv" />
     <EmbeddedResource Include="CSVs\ServerCapabilities.csv" />
     <EmbeddedResource Include="CSVs\Status Codes.csv" />
     <EmbeddedResource Include="CSVs\UNECE_to_OPCUA.csv" />
     <EmbeddedResource Include="Design.v103\BuiltInTypes.xml" />
-    <EmbeddedResource Include="Design.v103\MDIS.xml" />
-    <EmbeddedResource Include="Design.v103\MTConnectModel.xml" />
-    <EmbeddedResource Include="Design.v103\OpcUaAdiModel.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaDiModel.csv" />
     <EmbeddedResource Include="Design.v103\OpcUaDiModel.xml" />
-    <EmbeddedResource Include="Design.v103\OpcUaFdiPart5Model.xml" />
-    <EmbeddedResource Include="Design.v103\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.csv" />
     <EmbeddedResource Include="Design.v103\OpcUaGdsModel.xml" />
-    <EmbeddedResource Include="Design.v103\OpcUaPLCopenModel.xml" />
-    <EmbeddedResource Include="Design.v103\SercosModel.xml" />
     <EmbeddedResource Include="Design.v103\StandardTypes.csv" />
     <EmbeddedResource Include="Design.v103\StandardTypes.xml" />
     <EmbeddedResource Include="Design.v103\UA Attributes.csv" />
@@ -366,29 +351,19 @@
     <EmbeddedResource Include="Design.v103\UA Status Codes.xml" />
     <EmbeddedResource Include="Design.v104\BuiltInTypes.xml" />
     <EmbeddedResource Include="Design.v104\DemoModel.xml" />
-    <EmbeddedResource Include="Design.v104\MDIS.xml" />
-    <EmbeddedResource Include="Design.v104\MTConnectModel.xml" />
-    <EmbeddedResource Include="Design.v104\OpcUaAdiModel.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaDiModel.xml" />
-    <EmbeddedResource Include="Design.v104\OpcUaFdiPart5Model.xml" />
-    <EmbeddedResource Include="Design.v104\OpcUaFdiPart7Model.xml" />
     <EmbeddedResource Include="Design.v104\OpcUaGdsModel.xml" />
-    <EmbeddedResource Include="Design.v104\OpcUaPLCopenModel.xml" />
-    <EmbeddedResource Include="Design.v104\SercosModel.xml" />
     <EmbeddedResource Include="Design.v104\StandardTypes.xml" />
     <EmbeddedResource Include="Design.v104\UA Attributes.xml" />
     <EmbeddedResource Include="Design.v104\UA Core Services.xml" />
     <EmbeddedResource Include="Design.v104\UA Status Codes.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaDiPackageMetadataModel.xml" />
     <EmbeddedResource Include="Design.v105\TestModel.xml" />
     <EmbeddedResource Include="Design.v105\WotConnection.xml" />
-    <EmbeddedResource Include="Design.v105\I4AAS.IRDI.xml" />
     <EmbeddedResource Include="Design.v105\BuiltInTypes.xml" />
-    <EmbeddedResource Include="Design.v105\I4AAS.Submodels.xml" />
     <EmbeddedResource Include="Design.v105\DemoModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaDiModel.xml" />
     <EmbeddedResource Include="Design.v105\OpcUaGdsModel.xml" />
-    <EmbeddedResource Include="Design.v105\OpcUaNodeSetModel.xml" />
     <EmbeddedResource Include="Design.v105\StandardTypes.xml" />
     <EmbeddedResource Include="Design.v105\UA Attributes.xml" />
     <EmbeddedResource Include="Design.v105\UA Core Services.xml" />

PublishNodeSet.bat

@@ -6,7 +6,7 @@ IF "%2"=="" (goto :usage)
 IF "%3"=="" (goto :usage)
 
 set ROOT=%~dp0
-set MODELCOMPILER=%ROOT%build\bin\Release\net6.0\Opc.Ua.ModelCompiler.exe
+set MODELCOMPILER=%ROOT%build\bin\Release\net9.0\Opc.Ua.ModelCompiler.exe
 set NODESETS=%1
 set NAME=%2
 set TARGET=-uri %3