From d4e38a84ae6edf82199feebb8e4173b530b491ff Mon Sep 17 00:00:00 2001 From: Martin Regen Date: Mon, 3 Jul 2017 20:31:30 +0200 Subject: [PATCH] fix AppVeyor build (#18) * 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 --- .travis.yml | 2 +- ComIOP/Common/UA COM Interop Library.csproj | 10 +++++----- ComIOP/UA COM Interop.sln | 4 ---- .../ProxyServer/UA COM Proxy Server.vcxproj | 3 --- NuGet.Config | 3 +++ .../Samples/Client/Opc.Ua.SampleClient.csproj | 4 ++-- .../Client/Opc.Ua.SampleClient_TemporaryKey.pfx | Bin 0 -> 2528 bytes .../Samples/Server/Opc.Ua.SampleServer.csproj | 4 ++-- .../Server/Opc.Ua.SampleServer_TemporaryKey.pfx | Bin 0 -> 2528 bytes .../Aggregation/Server/Aggregation Server.csproj | 3 --- appveyor.yml | 3 +-- 11 files changed, 14 insertions(+), 22 deletions(-) create mode 100644 SampleApplications/Samples/Client/Opc.Ua.SampleClient_TemporaryKey.pfx create mode 100644 SampleApplications/Samples/Server/Opc.Ua.SampleServer_TemporaryKey.pfx diff --git a/.travis.yml b/.travis.yml index 353ca4496c..ce3047d648 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/ComIOP/Common/UA COM Interop Library.csproj b/ComIOP/Common/UA COM Interop Library.csproj index a44f583b2a..717d99c687 100644 --- a/ComIOP/Common/UA COM Interop Library.csproj +++ b/ComIOP/Common/UA COM Interop Library.csproj @@ -71,22 +71,22 @@ - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + ..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll diff --git a/ComIOP/UA COM Interop.sln b/ComIOP/UA COM Interop.sln index ddbffcd426..f0d6d5cd04 100644 --- a/ComIOP/UA COM Interop.sln +++ b/ComIOP/UA COM Interop.sln @@ -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 diff --git a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj index 4a831ef837..94ec92b293 100644 --- a/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj +++ b/ComIOP/Wrapper/ProxyServer/UA COM Proxy Server.vcxproj @@ -218,9 +218,6 @@ rem echo Registered Server at "$(TargetPath)" {268ae545-d614-4b66-aef3-c5b85919ad9d} - - {f4805912-a3f9-4045-bc63-01f34a216ee7} - diff --git a/NuGet.Config b/NuGet.Config index ed3725c3fb..708cc23cc2 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -1,5 +1,8 @@ + + + diff --git a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj index c3a0964c9a..2842beae37 100644 --- a/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj +++ b/SampleApplications/Samples/Client/Opc.Ua.SampleClient.csproj @@ -18,7 +18,7 @@ 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Opc.Ua.SampleClient_TemporaryKey.pfx - E237253D2F37CA88725B38D770B18B8BECD07F4A + 64BE0C76806C3D30DBE20B7987482C7B9728BBF1 win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot @@ -66,7 +66,7 @@ prompt true false - true + false true diff --git a/SampleApplications/Samples/Client/Opc.Ua.SampleClient_TemporaryKey.pfx b/SampleApplications/Samples/Client/Opc.Ua.SampleClient_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..22697772a529de0e203396b35d42ef5b9c1047e7 GIT binary patch literal 2528 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 literal 0 HcmV?d00001 diff --git a/SampleApplications/Samples/Server/Opc.Ua.SampleServer.csproj b/SampleApplications/Samples/Server/Opc.Ua.SampleServer.csproj index b3ef71d777..2e0e28f9e0 100644 --- a/SampleApplications/Samples/Server/Opc.Ua.SampleServer.csproj +++ b/SampleApplications/Samples/Server/Opc.Ua.SampleServer.csproj @@ -17,7 +17,7 @@ 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Opc.Ua.SampleServer_TemporaryKey.pfx - 4D2D038A175EA5C42DA7B84B6265FD3087BA8709 + 86B7AC100B82B9BC36477058A320AD959145BE2C win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot @@ -88,7 +88,7 @@ prompt true false - true + false diff --git a/SampleApplications/Samples/Server/Opc.Ua.SampleServer_TemporaryKey.pfx b/SampleApplications/Samples/Server/Opc.Ua.SampleServer_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..62bd328bb20eef081f8fb88cd02a147cb101efba GIT binary patch literal 2528 zcmZWpc{tQ-8~%+M!;FeyM%E%rCCqQE!`SyF5)($2v4+UL7d6%jQ}!`(WNGX%5u!+x zHVGAC?3I-0*a|t*xxVk5>$|?|xt`^|@8@~n_n-FxDTr|n2o$6s3g8I26tk3#y$~)) z2?cQ(MnNRA=}RDm^XLCaoQp6D=SMa@%l1h)&wr-&AR!zj6xc720{aPy!IA%^*@y3g zabJlXev%)(bC-jIYXC-pjW7kQ`}sEHdCMPm_iTNtcFAEZm1)%O z6qoa>b1OEl?0Hkq1BfbQcOE!HzR??FmdhD9H?S{WdcfGBtlyyzH(Ogw|-MY6CvAn%1?QUd#D+4wBX(n%shuj??bKy zhg?g>MSYhfgTWrT#TkofKw4)U?tkWM1ar%c z&slQZs-0LB_9FNI2dJ1aIvwkg`9+>sD)_{}u z(X=9wtD5GeCZBPL=_j?%^+d2t@d8~V6HPU$>#e)=enn`_lxYH7sxCVCi+6!q`_wksd){0iv48Y;TUVfDamtjn#|xaNxhY%zQiruWK%FR zY;+?3MVW-q`b~-Ld9mjD?-}c|M@WrAMWXd5pWlzKJFGbsf8SHfypZ$whK>*XRp@GV zN29{Ax)y=f)Y((*5ng@H3I)lQMUE%bgYx>ui;Ze3aGOK<^(1ct*bR4;#TG+&kzgqy z{3v-jy3O|(@xs@=zw{kgbMvo5gjKuYz0E9*Mn^3bjSO16oG;%8*Z0-(N~nyetFkBV zqJvT7G<4qj>&K%XW951z3^Af7py0E-Yab6#p%=7nje6|z$9s>U9isxc?r;&6(r)9A`x7Pmy++5F z1qPU;toC0bjqTl@?ny`R6f$GaZZ`z;@U4-Yz_W7|ps@~ee=vt-?*r75KTG)20Nq!{ zXb`L9yl!>$RZC$?;JP0%Tg@R0?&Ecm*`0ny5|uv5lTvmt@mb+a?RFAqo8K$GeKv9; zd{A(~CBR8u^SEz}$K_zZiq+%$*%myDof-?vqsfw=wXu`( zBW{cFOT&qk)2_j$0`+&;_7aQtn@nT+Q!dJ5+r+pcxL zs=2Uo(Gq+^H93NJc%Bmf#@02-mF3o=V$rW()+)`<^2&N>Z`I?}a(x87AD_E44rxx# zcze;LwIp@w@Y;-v2 z-Pl zj$Ns+YYn!pz>Xk0tNva6X7OxSWt%6vPYLh<8A0Ql%0PNWDH**d+!$yYeItB=4b3tqz%Dz4r@cnyA0^=7b#FY(l2kt^&m))&ZsdGDwy&veW7?-NzICq<$u1=qI&S&zc2u%VL7McJc+KlLwY92z z8i%ueig4IaGjwZZYrPc3pvuK$Om<;KT~#6pj7_%C!?`BJEWQmN8HU(dFIjm7VI5@hI7cDkASw zRI2Wq5=^c#RuWpYLo?3rs|+%1_wx>~`Z~IVS9jBD`i89KxR($-; z4$}q_m#7CVp4+^tw==(|{Y_1|4ebezLA!-9E?5`+IIfr*Bzp&^z5H z&f!ktgIn#pU5hO*kb$m#*j>krRYUDe$tWb@>(UKM>b31~g0G=&&Blc%V}-RGS{jQ5 zS9BNuWSQxA5WsNaOO-4VPX3(v?vFp7Iy1jDNOBzDm1d3^kOOaz7bKFdMv1jCo)WA@6j(t{*O|Q90P~xwr-x!n5iqhxz z7(OA%T3J{Rkj)~$4-QE#Q$O;xiTi9uua7A5gHw9)vqMUOOtSWrtq!ltk1CWxhm1=9 zq?Xh`@Pk8K?yp-u5)@T<1p+tI819OQryUHdI^_k8mrXo_XhIulNB35VZ2M0BB*|8` z0-0PWp^CYrHZ*$z)m0J$hPYdrAC7)B=kwiFFU`m#?DaW$oei6=SPY3S;7)U+?<(9Y zKT}nXFwE!7G(9-S`-U*Cl$Tx|D>C8au!CnI&BND_>NC>cra>L?M?zVYl|<@iTI%s6 zIX&*6MA;af-ZK~Wui1TY=3t~33x;tE|61TS014nhkPFUvY#)?E1cr`~@ermoSkqsI nSFW3;psIC{aW`OS3lVUk%xCWrh1_LYckjJ~;bcbZ?~nHvf}&&J literal 0 HcmV?d00001 diff --git a/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj b/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj index 09bdf4d79e..85929c895f 100644 --- a/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj +++ b/SampleApplications/Workshop/Aggregation/Server/Aggregation Server.csproj @@ -64,9 +64,6 @@ - - ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - diff --git a/appveyor.yml b/appveyor.yml index 0e3136288b..d5db12698e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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: