Merge pull request #184 from OPCFoundation/develop_erichb

Upgrade other projects to VS2017 and .NetCore1.1
This commit is contained in:
Erich Barnstedt
2017-06-30 07:55:15 -07:00
committed by GitHub
45 changed files with 433 additions and 3076 deletions
@@ -1033,10 +1033,6 @@
<Project>{a39614ca-8ebe-4408-a9d2-38c7e5ae2a1d}</Project>
<Name>Opc.Ua.Configuration</Name>
</ProjectReference>
<ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
<Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
<Name>Opc.Ua.Sample</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -452,7 +452,7 @@ namespace Opc.Ua.Sample.Controls
if (server != null)
{
server.RegisterWithDiscoveryServer();
server.RegisterWithDiscoveryServer().Wait();
}
}
catch (Exception exception)
@@ -752,17 +752,13 @@
<Name>Opc.Ua.Configuration</Name>
</ProjectReference>
<ProjectReference Include="..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
<Project>{6c449a1e-244e-4515-9949-a7e22012537c}</Project>
<Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
<Name>Opc.Ua.Server</Name>
</ProjectReference>
<ProjectReference Include="..\ClientControls.Net4\UA Client Controls.csproj">
<Project>{A247D2EE-14FC-463D-A9BA-6CFF1EF22B7A}</Project>
<Name>UA Client Controls</Name>
</ProjectReference>
<ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
<Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
<Name>Opc.Ua.Sample</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -133,17 +133,13 @@
<Name>Opc.Ua.Configuration</Name>
</ProjectReference>
<ProjectReference Include="..\..\SDK\Opc.Ua.Server\Opc.Ua.Server.csproj">
<Project>{6c449a1e-244e-4515-9949-a7e22012537c}</Project>
<Project>{251c2bd9-33f5-4eb1-903d-8463c8fd16f0}</Project>
<Name>Opc.Ua.Server</Name>
</ProjectReference>
<ProjectReference Include="..\Controls.Net4\UA Sample Controls.csproj">
<Project>{92ae819b-4938-4502-ac32-67063f9893cd}</Project>
<Name>UA Sample Controls</Name>
</ProjectReference>
<ProjectReference Include="..\Opc.Ua.Sample\Opc.Ua.Sample.csproj">
<Project>{bcb915b6-b5c3-45bc-9c8b-f43008df0c14}</Project>
<Name>Opc.Ua.Sample</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.