From cffa84e2891a99f9714a556dd8fe2f5cc33ccb43 Mon Sep 17 00:00:00 2001 From: Erich Barnstedt Date: Tue, 21 Jun 2016 15:21:59 +0200 Subject: [PATCH] Fixed project.json files. --- .../NetCoreConsoleClient/NetCoreConsoleClient.xproj | 2 +- .../NetCoreConsoleClient/Properties/AssemblyInfo.cs | 2 +- .../Samples/NetCoreConsoleClient/project.json | 2 -- .../Samples/NetCoreConsoleServer/project.json | 5 +++-- UA-NetStandard.sln | 12 ++++++------ 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.xproj b/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.xproj index d5fe319b45..11709a1715 100644 --- a/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.xproj +++ b/SampleApplications/Samples/NetCoreConsoleClient/NetCoreConsoleClient.xproj @@ -7,7 +7,7 @@ - eeaa5dad-349e-4384-83be-8d362da1cdd3 + a9e3812c-982c-426f-987f-7882c712f64c NetCoreConsoleClient .\obj .\bin\ diff --git a/SampleApplications/Samples/NetCoreConsoleClient/Properties/AssemblyInfo.cs b/SampleApplications/Samples/NetCoreConsoleClient/Properties/AssemblyInfo.cs index 08a7d5571d..c741096013 100644 --- a/SampleApplications/Samples/NetCoreConsoleClient/Properties/AssemblyInfo.cs +++ b/SampleApplications/Samples/NetCoreConsoleClient/Properties/AssemblyInfo.cs @@ -16,4 +16,4 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("eeaa5dad-349e-4384-83be-8d362da1cdd3")] +[assembly: Guid("a9e3812c-982c-426f-987f-7882c712f64c")] diff --git a/SampleApplications/Samples/NetCoreConsoleClient/project.json b/SampleApplications/Samples/NetCoreConsoleClient/project.json index 06321e1b3a..d6a4020662 100644 --- a/SampleApplications/Samples/NetCoreConsoleClient/project.json +++ b/SampleApplications/Samples/NetCoreConsoleClient/project.json @@ -5,7 +5,6 @@ }, "dependencies": { - "Common": "1.0.0-*", "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc2-3002702" @@ -13,7 +12,6 @@ "Opc.Ua.Client": "1.0.0-*", "Opc.Ua.Configuration": "1.0.0-*", "Opc.Ua.Core": "1.0.0-*", - "Opc.Ua.Server": "1.0.0-*", "System.Net.NameResolution": "4.0.0-rc2-24027" }, diff --git a/SampleApplications/Samples/NetCoreConsoleServer/project.json b/SampleApplications/Samples/NetCoreConsoleServer/project.json index f6ff1d1c78..ae8df1dcc9 100644 --- a/SampleApplications/Samples/NetCoreConsoleServer/project.json +++ b/SampleApplications/Samples/NetCoreConsoleServer/project.json @@ -12,8 +12,9 @@ }, "Opc.Ua.Configuration": "1.0.0-*", "Opc.Ua.Core": "1.0.0-*", - "Opc.Ua.Server": "1.0.0-*" - }, + "Opc.Ua.Server": "1.0.0-*", + "System.Net.NameResolution": "4.0.0-rc2-24027" + }, "frameworks": { "netcoreapp1.0": { diff --git a/UA-NetStandard.sln b/UA-NetStandard.sln index f123c8d57f..0756830d8f 100644 --- a/UA-NetStandard.sln +++ b/UA-NetStandard.sln @@ -19,8 +19,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsClient", "Sampl EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleClient", "SampleApplications\Samples\ConsoleClient\ConsoleClient.csproj", "{D1C63E60-8EAF-4109-9135-E70450C1AA79}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetCoreConsoleClient", "SampleApplications\Samples\NetCoreConsoleClient\NetCoreConsoleClient.xproj", "{EEAA5DAD-349E-4384-83BE-8D362DA1CDD3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamarinClient", "SampleApplications\Samples\XamarinClient\XamarinClient.csproj", "{3D9C730D-28BA-42FE-993F-166B16F7E093}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfClient", "SampleApplications\Samples\WpfClient\WpfClient.csproj", "{4435C870-4963-4815-9E65-8FAEB931F9B2}" @@ -29,6 +27,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Opc.Ua.Sample", "SampleAppl EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetCoreConsoleServer", "SampleApplications\Samples\NetCoreConsoleServer\NetCoreConsoleServer.xproj", "{EEAD3395-47A2-453F-9212-D26BF0727188}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NetCoreConsoleClient", "SampleApplications\Samples\NetCoreConsoleClient\NetCoreConsoleClient.xproj", "{A9E3812C-982C-426F-987F-7882C712F64C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -67,10 +67,6 @@ Global {D1C63E60-8EAF-4109-9135-E70450C1AA79}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1C63E60-8EAF-4109-9135-E70450C1AA79}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1C63E60-8EAF-4109-9135-E70450C1AA79}.Release|Any CPU.Build.0 = Release|Any CPU - {EEAA5DAD-349E-4384-83BE-8D362DA1CDD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEAA5DAD-349E-4384-83BE-8D362DA1CDD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEAA5DAD-349E-4384-83BE-8D362DA1CDD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEAA5DAD-349E-4384-83BE-8D362DA1CDD3}.Release|Any CPU.Build.0 = Release|Any CPU {3D9C730D-28BA-42FE-993F-166B16F7E093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D9C730D-28BA-42FE-993F-166B16F7E093}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D9C730D-28BA-42FE-993F-166B16F7E093}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -87,6 +83,10 @@ Global {EEAD3395-47A2-453F-9212-D26BF0727188}.Debug|Any CPU.Build.0 = Debug|Any CPU {EEAD3395-47A2-453F-9212-D26BF0727188}.Release|Any CPU.ActiveCfg = Release|Any CPU {EEAD3395-47A2-453F-9212-D26BF0727188}.Release|Any CPU.Build.0 = Release|Any CPU + {A9E3812C-982C-426F-987F-7882C712F64C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A9E3812C-982C-426F-987F-7882C712F64C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A9E3812C-982C-426F-987F-7882C712F64C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A9E3812C-982C-426F-987F-7882C712F64C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE