GithubStar/UA-.NETStandard
1
0
Fork 0
mirror of https://github.com/OPCFoundation/UA-.NETStandard.git synced 2026-10-16 21:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix AppVeyor build (#18)

Browse Source 
* update UWP APP certs

* fix UWP release build

* fix solution path

* unify the nuget package location for all projects

* fix some package refs

* new restore test

* remove comiop project from appveyor build
This commit is contained in:
Martin Regen
2017-07-03 20:31:30 +02:00
committed by GitHub
parent 80ef672487
commit d4e38a84ae
11 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -12,7 +12,7 @@ install:
- sudo apt-get install dotnet-dev-1.0.4 -y
script:
- echo "========== build all .Net Core samples ============"
- dotnet restore
- dotnet restore "UA-NetStandard.sln"
- dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleClient
- dotnet build -c Debug -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleServer
- dotnet build -c Release -f netcoreapp1.1 SampleApplications/Samples/NetCoreConsoleClient
ComIOP/Common/UA COM Interop Library.csproj
+5 -5
View File
@@ -71,22 +71,22 @@
<Reference Include="System.IdentityModel" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
<HintPath>..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
ComIOP/UA COM Interop.sln
-4
View File
@@ -90,13 +90,11 @@ Global
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Win32.ActiveCfg = Debug|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Debug|Win32.Build.0 = Debug|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Any CPU.Build.0 = Release|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Win32.ActiveCfg = Release|Any CPU
{24D3C616-ED4C-4AF9-B529-7B418EC8ACC4}.Release|Win32.Build.0 = Release|Any CPU
{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Any CPU.ActiveCfg = Debug|Win32
{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{C228B4A7-8A03-4663-AD6C-8B16CE83D4DC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -112,13 +110,11 @@ Global
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Win32.ActiveCfg = Debug|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Debug|Win32.Build.0 = Debug|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Any CPU.Build.0 = Release|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Win32.ActiveCfg = Release|Any CPU
{F4805912-A3F9-4045-BC63-01F34A216EE7}.Release|Win32.Build.0 = Release|Any CPU
{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9A35B29-E6A9-4A71-A2C2-424E87BB5E50}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj
-3
View File
@@ -218,9 +218,6 @@ rem echo Registered Server at "$(TargetPath)"
<ProjectReference Include="..\Common\OPC Sample Utility Classes.vcxproj">
<Project>{268ae545-d614-4b66-aef3-c5b85919ad9d}</Project>
</ProjectReference>
<ProjectReference Include="..\ServerWrapper\UA COM Server Wrapper.csproj">
<Project>{f4805912-a3f9-4045-bc63-01f34a216ee7}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
NuGet.Config
+3
View File
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<add key="repositoryPath" value="./packages" />
</config>
<packageSources>
<!-- To enable LocalFeed for testing uncomment the following line -->
<!-- <add key="Local" value="./nuget" /> -->
SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj
+2 -2
View File
@@ -18,7 +18,7 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>Opc.Ua.SampleClient_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>E237253D2F37CA88725B38D770B18B8BECD07F4A</PackageCertificateThumbprint>
<PackageCertificateThumbprint>64BE0C76806C3D30DBE20B7987482C7B9728BBF1</PackageCertificateThumbprint>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
@@ -66,7 +66,7 @@
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
<EnableGatekeeperAnalysis>true</EnableGatekeeperAnalysis>
<EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
SampleApplications/Samples/Client/Opc.Ua.SampleClient_TemporaryKey.pfx
BIN
View File
Binary file not shown.
SampleApplications/Samples/Server/Opc.Ua.SampleServer.csproj
+2 -2
View File
@@ -17,7 +17,7 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>Opc.Ua.SampleServer_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>4D2D038A175EA5C42DA7B84B6265FD3087BA8709</PackageCertificateThumbprint>
<PackageCertificateThumbprint>86B7AC100B82B9BC36477058A320AD959145BE2C</PackageCertificateThumbprint>
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -88,7 +88,7 @@
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
<EnableGatekeeperAnalysis>true</EnableGatekeeperAnalysis>
<EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
</PropertyGroup>
<ItemGroup>
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
SampleApplications/Samples/Server/Opc.Ua.SampleServer_TemporaryKey.pfx
BIN
View File
Binary file not shown.
SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj
-3
View File
@@ -64,9 +64,6 @@
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AggregatedTypeCache.cs" />
appveyor.yml
+1 -2
View File
@@ -33,13 +33,12 @@ clone_depth: 5 # clone entire repository history if not def
environment:
matrix:
- solution_name: UA-NetStandard.sln
- solution_name: "UA COM Interop.sln"
- solution_name: "SampleApplications/Workshop/Aggregation/UA Aggregation.sln"
- solution_name: "SampleApplications/Workshop/Reference/UA Reference.sln"
# this is how to allow failing jobs in the matrix
matrix:
fast_finish: true # set this flag to immediately finish build once one of the jobs fails.
fast_finish: false # set this flag to immediately finish build once one of the jobs fails.
# scripts to run before build
before_build: