From ab5366f08fa586161b85fff3e742bb3109ab1071 Mon Sep 17 00:00:00 2001 From: Erich Barnstedt Date: Sun, 7 Aug 2016 15:04:36 +0200 Subject: [PATCH] Untangling output directory for .Net4 assemblies/programs to allow parallel builds without file access violations. --- .../Samples/Client.Net4/UA Sample Client.csproj | 6 ++++-- .../UA Client Controls.csproj | 8 ++++++-- .../Controls.Net4/UA Sample Controls.csproj | 8 ++++++-- .../Samples/GDS/GlobalDiscoveryServer.csproj | 6 ++++-- .../GDSClient/GlobalDiscoveryClient.csproj | 5 +++-- .../GDSCommon/GlobalDiscoveryLibrary.csproj | 9 +++++++-- .../Publisher.Net4/Opc.Ua.Publisher.Net4.csproj | 4 ++-- .../Samples/Server.Net4/UA Sample Server.csproj | 6 ++++-- .../UA Server Controls.csproj | 8 ++++++-- UA-NetStandard.sln | 16 ++++++++++++++++ 10 files changed, 58 insertions(+), 18 deletions(-) diff --git a/SampleApplications/Samples/Client.Net4/UA Sample Client.csproj b/SampleApplications/Samples/Client.Net4/UA Sample Client.csproj index dec258d159..cf24082e79 100644 --- a/SampleApplications/Samples/Client.Net4/UA Sample Client.csproj +++ b/SampleApplications/Samples/Client.Net4/UA Sample Client.csproj @@ -43,7 +43,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -54,7 +54,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -155,10 +155,12 @@ {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A} UA Client Controls + True {92AE819B-4938-4502-AC32-67063F9893CD} UA Sample Controls + True diff --git a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj index 14a97c46b2..67ea56350a 100644 --- a/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj +++ b/SampleApplications/Samples/ClientControls.Net4/UA Client Controls.csproj @@ -40,7 +40,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -52,7 +52,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -65,18 +65,22 @@ False ..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll + True False ..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll + True False ..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll + True False ..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll + True diff --git a/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj b/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj index 034c0b3a83..85d16fc697 100644 --- a/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj +++ b/SampleApplications/Samples/Controls.Net4/UA Sample Controls.csproj @@ -40,7 +40,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ TRACE;DEBUG prompt 4 @@ -50,7 +50,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -65,18 +65,22 @@ False ..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll + True False ..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll + True False ..\Opc.Ua.Sample\bin\Debug\net46\Opc.Ua.Sample.dll + True False ..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll + True diff --git a/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj b/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj index 554b256794..3648e562e0 100644 --- a/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj +++ b/SampleApplications/Samples/GDS/GlobalDiscoveryServer.csproj @@ -39,7 +39,7 @@ true full false - ..\..\Bin\Debug\ + Bin\Debug\ DEBUG;TRACE prompt 4 @@ -51,7 +51,7 @@ pdbonly true - ..\..\Bin\Release\ + Bin\Release\ TRACE prompt 4 @@ -210,10 +210,12 @@ {a247d2ee-14fc-463d-a9ba-6cff1ef22b7a} UA Client Controls + True {80056988-44E7-4EF4-9F59-50BCF215CB03} UA Server Controls + True {5A647CC0-5FD8-476B-8C14-8A9CED9CF5BE} diff --git a/SampleApplications/Samples/GDSClient/GlobalDiscoveryClient.csproj b/SampleApplications/Samples/GDSClient/GlobalDiscoveryClient.csproj index 534c77534d..df2e4df91d 100644 --- a/SampleApplications/Samples/GDSClient/GlobalDiscoveryClient.csproj +++ b/SampleApplications/Samples/GDSClient/GlobalDiscoveryClient.csproj @@ -19,7 +19,7 @@ true full false - ..\..\Bin\Debug\ + Bin\Debug\ DEBUG;TRACE prompt 4 @@ -30,7 +30,7 @@ AnyCPU pdbonly true - ..\..\Bin\Release\ + Bin\Release\ TRACE prompt 4 @@ -162,6 +162,7 @@ {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A} UA Client Controls + True {5A647CC0-5FD8-476B-8C14-8A9CED9CF5BE} diff --git a/SampleApplications/Samples/GDSCommon/GlobalDiscoveryLibrary.csproj b/SampleApplications/Samples/GDSCommon/GlobalDiscoveryLibrary.csproj index 73149c9ae7..59dea2d54f 100644 --- a/SampleApplications/Samples/GDSCommon/GlobalDiscoveryLibrary.csproj +++ b/SampleApplications/Samples/GDSCommon/GlobalDiscoveryLibrary.csproj @@ -40,7 +40,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ TRACE;DEBUG prompt 4 @@ -51,7 +51,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -107,18 +107,22 @@ False ..\..\SDK\Opc.Ua.Client\bin\Debug\net46\Opc.Ua.Client.dll + True False ..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll + True False ..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll + True False ..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll + True ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll @@ -405,6 +409,7 @@ {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A} UA Client Controls + True diff --git a/SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Net4.csproj b/SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Net4.csproj index 9b4e7425d7..fbabdd8032 100644 --- a/SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Net4.csproj +++ b/SampleApplications/Samples/Publisher.Net4/Opc.Ua.Publisher.Net4.csproj @@ -43,7 +43,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -54,7 +54,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 diff --git a/SampleApplications/Samples/Server.Net4/UA Sample Server.csproj b/SampleApplications/Samples/Server.Net4/UA Sample Server.csproj index c569329d05..2268fa27ef 100644 --- a/SampleApplications/Samples/Server.Net4/UA Sample Server.csproj +++ b/SampleApplications/Samples/Server.Net4/UA Sample Server.csproj @@ -28,7 +28,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -39,7 +39,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -132,10 +132,12 @@ {A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A} UA Client Controls + True {92AE819B-4938-4502-AC32-67063F9893CD} UA Sample Controls + True diff --git a/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj b/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj index 3f88ead007..d94e87dd13 100644 --- a/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj +++ b/SampleApplications/Samples/ServerControls.Net4/UA Server Controls.csproj @@ -41,7 +41,7 @@ true full false - ..\..\bin\Debug\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -51,7 +51,7 @@ pdbonly true - ..\..\bin\Release\ + bin\Release\ TRACE prompt 4 @@ -62,18 +62,22 @@ False ..\..\SDK\Opc.Ua.Configuration\bin\Debug\net46\Opc.Ua.Configuration.dll + True False ..\..\..\Stack\Opc.Ua.Core\bin\Debug\net46\Opc.Ua.Core.dll + True False ..\..\SDK\Opc.Ua.Server\bin\Debug\net46\Opc.Ua.Server.dll + True 3.5 + True diff --git a/UA-NetStandard.sln b/UA-NetStandard.sln index 8cb8ade6c1..4d05707d5a 100644 --- a/UA-NetStandard.sln +++ b/UA-NetStandard.sln @@ -123,10 +123,26 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalDiscoveryLibrary", "SampleApplications\Samples\GDSCommon\GlobalDiscoveryLibrary.csproj", "{5A647CC0-5FD8-476B-8C14-8A9CED9CF5BE}" + ProjectSection(ProjectDependencies) = postProject + {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} + {0BACFD1F-8BD1-45E2-81AD-F9DBB5FBE028} = {0BACFD1F-8BD1-45E2-81AD-F9DBB5FBE028} + {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} + {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalDiscoveryClient", "SampleApplications\Samples\GDSClient\GlobalDiscoveryClient.csproj", "{2ADA8796-AC1F-4031-9162-D4ED79D828AF}" + ProjectSection(ProjectDependencies) = postProject + {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} + {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} + {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} = {ABD9427F-FB32-4689-AB4F-22BCFB8DE2F4} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalDiscoveryServer", "SampleApplications\Samples\GDS\GlobalDiscoveryServer.csproj", "{2E23571F-9987-4EBD-A9FD-5D5DD639E071}" + ProjectSection(ProjectDependencies) = postProject + {C444E219-EED3-4775-B399-B81FF2B900AF} = {C444E219-EED3-4775-B399-B81FF2B900AF} + {6C449A1E-244E-4515-9949-A7E22012537C} = {6C449A1E-244E-4515-9949-A7E22012537C} + {99A94D4A-810D-49EF-B043-7F560E654A41} = {99A94D4A-810D-49EF-B043-7F560E654A41} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution