Service Update of OPC stack (#47)

- latest OPC Stack with fix for #44

api-csharp/Microsoft.Azure.IIoT.OpcUa.Api.Vault.csproj

@@ -6,10 +6,9 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Company>Microsoft</Company>
-    <Product>Microsoft Azure Industrial IoT OPC UA Vault Service Api</Product>
+    <Product>Microsoft Azure Industrial IoT OPC Vault Service Api</Product>
     <Description>Microsoft Azure Industrial IoT OPC UA Vault Service Api</Description>
     <PackageLicenseUrl>https://github.com/Azure/azure-iiot-opc-vault-service/blob/master/license.txt</PackageLicenseUrl>
-    <Copyright>Copyright © 2018 Microsoft Corp. All rights reserved.</Copyright>
     <Configurations>Debug;Release;Develop</Configurations>
     <HighEntropyVA>true</HighEntropyVA>
   </PropertyGroup>

app/Microsoft.Azure.IIoT.OpcUa.Services.Vault.App.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -21,9 +21,21 @@
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="2.2.0" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.3" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.354.23" />
   </ItemGroup>
 
+  <Choose>
+    <When Condition="'$(Configuration)'=='Release'">
+      <ItemGroup>
+        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.355.25" />
+      </ItemGroup>
+    </When>
+    <Otherwise>
+      <ItemGroup>
+        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.355.25" />
+      </ItemGroup>
+    </Otherwise>
+  </Choose>
+
   <ItemGroup>
     <ProjectReference Include="..\api-csharp\Microsoft.Azure.IIoT.OpcUa.Api.Vault.csproj" />
   </ItemGroup>

common.props

@@ -1,17 +1,15 @@
 <Project>
   <PropertyGroup>
     <Product>Microsoft Azure Industrial IoT OPC UA Vault Service</Product>
-    <PackageLicenseUrl>$(RepositoryUrl)/blob/master/LICENSE</PackageLicenseUrl>
-    <Authors>Microsoft</Authors>
+    <PackageLicenseUrl>$(RepositoryUrl)/blob/master/license.txt</PackageLicenseUrl>
+    <Authors>Azure Industrial IoT</Authors>
     <Company>Microsoft</Company>
-    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
+    <Copyright>Copyright © 2019 Microsoft Corp. All rights reserved.</Copyright>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkID=288890</PackageIconUrl>
     <PackageReleaseNotes>$(RepositoryUrl)/releases</PackageReleaseNotes>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <HighEntropyVA>true</HighEntropyVA>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- prevent building packages and releasing to nuget until ready/public -->
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 </Project>

module/Microsoft.Azure.IIoT.OpcUa.Modules.Vault.csproj

@@ -19,9 +19,18 @@
       </ItemGroup>
     </When>
     <Otherwise>
-      <ItemGroup>
-        <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.354.23" />
-      </ItemGroup>
+      <Choose>
+        <When Condition="'$(Configuration)'=='Release'">
+          <ItemGroup>
+            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.355.25" />
+          </ItemGroup>
+        </When>
+        <Otherwise>
+          <ItemGroup>
+            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.355.25" />
+          </ItemGroup>
+        </Otherwise>
+      </Choose>
     </Otherwise>
   </Choose>
 

src/Microsoft.Azure.IIoT.OpcUa.Services.Vault.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <LangVersion>7.2</LangVersion>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -63,12 +63,12 @@
       <Choose>
         <When Condition="'$(Configuration)'=='Release'">
           <ItemGroup>
-            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.354.23" />
+            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.355.25" />
           </ItemGroup>
         </When>
         <Otherwise>
           <ItemGroup>
-            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.354.23" />
+            <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Symbols" Version="1.4.355.25" />
           </ItemGroup>
         </Otherwise>
       </Choose>

version.props

@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
-    <VersionSuffix>preview-$([System.DateTime]::Now.ToString("yyyyMMdd"))</VersionSuffix>
+    <VersionSuffix Condition="'$(RELEASE_BUILD)' == ''">preview-$([System.DateTime]::Now.ToString("yyyyMMdd"))</VersionSuffix>
   </PropertyGroup>
 </Project>