diff --git a/SampleApplications/Workshop/Aggregation/.dockerignore b/SampleApplications/Workshop/Aggregation/.dockerignore new file mode 100644 index 0000000000..3729ff0cd1 --- /dev/null +++ b/SampleApplications/Workshop/Aggregation/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj index 8f97322500..4b9bee316c 100644 --- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj +++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/ConsoleAggregationServer.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp3.1 ConsoleAggregationServer Exe ConsoleAggregationServer @@ -13,6 +13,8 @@ false false false + Linux + -p 62530:62530 @@ -34,6 +36,10 @@ + + + + PreserveNewest diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Dockerfile b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Dockerfile new file mode 100644 index 0000000000..bf5e838585 --- /dev/null +++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Dockerfile @@ -0,0 +1,25 @@ +#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. + +FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base +WORKDIR /app + +FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build +WORKDIR /src +COPY ["ConsoleAggregationServer/ConsoleAggregationServer.csproj", "ConsoleAggregationServer/"] +COPY ["../../SDK/Opc.Ua.Server/Opc.Ua.Server.csproj", "../../SDK/Opc.Ua.Server/"] +COPY ["../../../Stack/Opc.Ua.Core/Opc.Ua.Core.csproj", "../../../Stack/Opc.Ua.Core/"] +COPY ["../../SDK/Opc.Ua.Configuration/Opc.Ua.Configuration.csproj", "../../SDK/Opc.Ua.Configuration/"] +COPY ["../../SDK/Opc.Ua.Client/Opc.Ua.Client.csproj", "../../SDK/Opc.Ua.Client/"] +RUN dotnet restore "ConsoleAggregationServer/ConsoleAggregationServer.csproj" +COPY . . +WORKDIR "/src/ConsoleAggregationServer" +RUN dotnet build "ConsoleAggregationServer.csproj" -c Release -o /app/build + +FROM build AS publish +RUN dotnet publish "ConsoleAggregationServer.csproj" -c Release -o /app/publish + +FROM base AS final +WORKDIR /app +COPY --from=publish /app/publish . +EXPOSE 62530 +ENTRYPOINT ["dotnet", "ConsoleAggregationServer.dll"] diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Properties/launchSettings.json b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Properties/launchSettings.json new file mode 100644 index 0000000000..3879df067f --- /dev/null +++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "ConsoleAggregationServer": { + "commandName": "Project" + }, + "Docker": { + "commandName": "Docker" + } + } +} \ No newline at end of file diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml index 588bc7e2eb..01dd406000 100644 --- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml +++ b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Quickstarts.AggregationServer.Config.xml @@ -55,7 +55,7 @@ - opc.tcp://localhost:62541/AggregationServer + opc.tcp://localhost:62530/AggregationServer diff --git a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Readme.htm b/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Readme.htm deleted file mode 100644 index 31be8f6193..0000000000 --- a/SampleApplications/Workshop/Aggregation/ConsoleAggregationServer/Readme.htm +++ /dev/null @@ -1,36 +0,0 @@ - - - - OPC Foundation UA Reference Server - - - -

- OPC Foundation UA Reference Server

-

- Introduction:

-

- This OPC Server is designed to be default OPC UA Server when opening the OPC UA - Compliance Test Tool (www.opcfoundation.org/uactt/) and uses an address-space - that matches the design of the CTT.

-

- This OPC Server is built with the Quickstart application template (OPC Server) - and uses the OPC Foundation .NET UA SDK. This OPC Server therefore supports the - opc.tcp and http transports.

-

- Download the CTT from: - http://www.opcfoundation.org/uactt/

-

- Finding the Address Space Configuration Code

-

- Project: Reference Server
- File: ReferenceNodeManager.cs
- Method: CreateAddressSpace

-

- Finding the UA Services

-

- Project: UA Server Library
- File: \Server\StandardServer.cs

- - - \ No newline at end of file diff --git a/SampleApplications/Workshop/Aggregation/UA Aggregation.sln b/SampleApplications/Workshop/Aggregation/UA Aggregation.sln index 5b52774fa3..f9e47bf3d3 100644 --- a/SampleApplications/Workshop/Aggregation/UA Aggregation.sln +++ b/SampleApplications/Workshop/Aggregation/UA Aggregation.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.14 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29920.165 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UA Client Controls", "..\..\Samples\ClientControls.Net4\UA Client Controls.csproj", "{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}" EndProject diff --git a/appveyor.yml b/appveyor.yml index cb2043da58..4238caff42 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ #---------------------------------# # version format -version: 1.4.359.{build}-{branch} +version: 1.4.360.{build}-{branch} # branches to build @@ -18,7 +18,7 @@ branches: #---------------------------------# # Build worker image (VM template) -image: Visual Studio 2017 +image: Visual Studio 2019 # scripts that are called at very beginning, before repo cloning init: