From 2f368aaa604c6be1f45cc428329ba215c27a0ea4 Mon Sep 17 00:00:00 2001 From: ziad Date: Thu, 8 Feb 2018 06:10:06 -0800 Subject: [PATCH] add sat folder to netstandard library fix signing key path and target --- .gitignore | 3 ++- makefiles/Makefile.csharp.mk | 6 +++--- .../CreateSigningKey/CreateSigningKey.csproj | 8 ++++++++ .../CreateSigningKey/CreateSigningKey.dll | Bin 5120 -> 0 bytes tools/netstandard/CreateSigningKey/Program.cs | 1 - tools/netstandard/OrTools.NetCore.csproj | 4 ++++ 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 tools/netstandard/CreateSigningKey/CreateSigningKey.csproj delete mode 100644 tools/netstandard/CreateSigningKey/CreateSigningKey.dll diff --git a/.gitignore b/.gitignore index 8eae3fe34c..5c63bc72fe 100644 --- a/.gitignore +++ b/.gitignore @@ -75,4 +75,5 @@ cache/ **/.vscode/* .DS_Store -!tools/netstandard/CreateSigningKey/CreateSigningKey.dll +tools/netstandard/CreateSigningKey/bin +tools/netstandard/CreateSigningKey/obj diff --git a/makefiles/Makefile.csharp.mk b/makefiles/Makefile.csharp.mk index d36365ea56..72b5ecccdb 100755 --- a/makefiles/Makefile.csharp.mk +++ b/makefiles/Makefile.csharp.mk @@ -195,7 +195,7 @@ endif netstandardortools: $(BIN_DIR)/$(NETSTANDARD_ORTOOLS_DLL_NAME)$(DLL) $(BIN_DIR)/$(CLR_PROTOBUF_DLL_NAME)$(DLL) $(NETSTANDARD_OBJ_DIR)/AssemblyInfo.cs: \ - $(NETSTANDARD_CLR_KEYFILE) \ + netstandard_keyfile \ $(GEN_DIR)/com/google/ortools/properties/CommonAssemblyInfo.cs $(COPY) tools$Scsharp$SAssemblyInfo.cs $(NETSTANDARD_OBJ_DIR)$SAssemblyInfo.cs ifdef CLR_KEYFILE @@ -297,9 +297,9 @@ ifdef CLR_KEYFILE sn -k $(CLR_KEYFILE) endif -$(NETSTANDARD_CLR_KEYFILE): +netstandard_keyfile: ifdef CLR_KEYFILE - $(PATH_TO_DOTNET_EXE) run tools$Snetstandard$SCreateSigningKey$SCreateSigningKey.dll $(CLR_KEYFILE) + $(PATH_TO_DOTNET_EXE) run --project tools$Snetstandard$SCreateSigningKey$SCreateSigningKey.csproj $(CLR_KEYFILE) endif $(BIN_DIR)/$(CLR_ORTOOLS_DLL_NAME)$(DLL): \ diff --git a/tools/netstandard/CreateSigningKey/CreateSigningKey.csproj b/tools/netstandard/CreateSigningKey/CreateSigningKey.csproj new file mode 100644 index 0000000000..ce1697ae88 --- /dev/null +++ b/tools/netstandard/CreateSigningKey/CreateSigningKey.csproj @@ -0,0 +1,8 @@ + + + + Exe + netcoreapp2.0 + + + diff --git a/tools/netstandard/CreateSigningKey/CreateSigningKey.dll b/tools/netstandard/CreateSigningKey/CreateSigningKey.dll deleted file mode 100644 index eee0ca516a3adb992ccf870e5d60f3e7addc9e7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5120 zcmeHLTWlOx8UD}MUOOASwVlRw$%W~rQQgK_uj7=q#!l8=J7E)FHeSaStx+;Nd%T`x zc4nC~>v$_D;h`0MplU#BQQL>84@E*kw17lJR8>NWKtLZVQ3<39ka!{>H4i)>6eWD; z%#6K`6Oz2-smGcBod0tE+qwOlspnp!CL(IacjE@p1@y9I6#W0-EZB)J{VGAf*!0mO z7ue)SkIXGuLa%ym*)uA-X*iDS>qV}6HAlA`eSD^%SKJa$wYSF~4OQnSh$dMRoqK)z zpCW62qa2vIxX-UBjvyB=`23bWox3$OGF*&-&!A{fe5_; zy)$y0Av)g@5*xddL|*`Y=`o_G8|il%>#MFS$u{6$ZJ3kt`HBzxs*Ddj6>I1>Fx7OT zlPOPlCNSk&27?$r=}<$eYvBGg^bvw~-{>$cA zUu(=o=yCeA^$7;1Mm@A;55W#mQtRC!SyKO4;m8_zVtYE)PqThAAK$kFvDcW`Tcy1j1AA$c{;$ya3L@yhrv%_08 z+9Z+xvO(%rc~Z*+o;ruf6v07wsN|J*2psKACV6s6HnHcl7(K6`Nr$xu=mkuV(W_Kv zF&bkZ170Bsf280g1s_-RGiv-}?J|o~Li;uJ{D56%2^ylytcy~x8>hDwJqe1m7g!DQ z)ImRG?`s2~G0N+bdyf9Va=_kJ*z5F|HiI~?D(vN+QRtVEF?vJWM57wRLQ2}hfN^>p zu!9B^d`7`h1#=1>Q}AmF*6A4Le1~4qcG4@L!~mPMKC&?G2mGt{Wxxj!#W{K&nJ|=0 z3QInRn6}W@0k_dN0e8_$fP3g7;2?br_!asTFiZacJgVpgz^$~Kn$JejBLvmnM=;GQ zq5#i?2dWtnMlC~sSIBzWpklA5{W6*~Jmr>ZHa|dxy6|}=m7Af7m8$FcSy5H{CpT`1 zsw<45&FPQ@5DI2pN4RU~Y|Zhl3a4j1%jc7p!zq}Do)>H7vYbEaV*?j!KBrM3c%^99 z=PbXGJZE@i?jOPp&d<2s>5cNzfqCu;%XKy~bIzjcRSX|Y!@jK){9d%mHBZT{DapE( zs%0zUEVqpnH4c{qGelt12@cKD3l7_#qp-#lvCE@ zhR+LD*#Yq=ucu13O|UNCw`dJ=Gbx#oKo?CJmJ@Mi`J&BDnTm)~;ARbLQ%_~RdexU| zs!Kpbm7sjORw;6iW(%VMx4^w+%j7V(Y?Z(`%pH!5arovs z?A$Uu!frZ|uN7^}oN?^BJO>ZEd0w+(9L#K)LA04~|l>+#WQwJ+RQBg^|zX(&iMxO%$e z`LvC?Tuj=^sN?1hhlhYsi#ok{qo98PPZa(Fx3s2@KbQVzhZc?tEce0-mQh+5cgJ@C{5HmBSXV&P`THxk_9sRb3tg2R0inK7zWvFWQMdeGtIe~;vtZ;P(D?-}f>clGUjoqYYHfs2s(vSg7?GYVSbPuTcpqg&r z2UP%Sva=0D4Ari`nW*TJvveEz^Z4QMS_b=4{s0MEN7H_c=BYp@04Hb`qZ}&qY2Z1) zLqWApA2feX9{5#0g0>u4wb94m{`y?w1_ymqpw#vOP+2)*QG7r~>zo zft$wy*HL_;_nNCXU<^L_kg`B8-$K)*l1Wqax1Wj_%i_BebFK9(ZUkLn5#d+=^1@h|&>xKMr|;J5l;lUFYlF=t|>SW2^qpLzf3_Yw-@?hE1=2 z()L!!%Z&L-)`72fLj-rSnZliI<4?9;R8b7oGe?wCi_A(D`H+#6v18)+%>B6HL^5-{1f%^}fJFP<+RVHfSbvka&;9CCVZ%3KyQRG)Z zcLh7bR`1;H=g8b+$7PAGG;HM0E`B(CaHV4F%RvP;lEfpB)VX82CA{M!$>Vc}_CB4| zg>N_|!*(4$lB{!)Jb0iz-X0$|!kSNq3P+42Yo0SC%q3ni#NLW!daiI6{k^7J88SpA zwLFm2D~4k&a^XjBn6d|Dy1uF`SHkmvs%D)}@|8;J4j#6VaDJA{4@FsG-f1U5c{i{iUz;J)GLI<$; Y_oL~-Z{L62(|>N<563>YaX&KfKSz;LtpET3 diff --git a/tools/netstandard/CreateSigningKey/Program.cs b/tools/netstandard/CreateSigningKey/Program.cs index dae4f4291a..1709d56c4c 100644 --- a/tools/netstandard/CreateSigningKey/Program.cs +++ b/tools/netstandard/CreateSigningKey/Program.cs @@ -8,7 +8,6 @@ namespace CreateSigningKey { static void Main(string[] args) { - args = new[] { "or-tools.snk" }; if (args == null || args.Length == 0) { Console.WriteLine("Key filename not specified."); diff --git a/tools/netstandard/OrTools.NetCore.csproj b/tools/netstandard/OrTools.NetCore.csproj index a3b296802c..70c17f6c7f 100644 --- a/tools/netstandard/OrTools.NetCore.csproj +++ b/tools/netstandard/OrTools.NetCore.csproj @@ -49,6 +49,10 @@ graph\%(Filename)%(Extension) + + sat\%(Filename)%(Extension) + + sat\%(Filename)%(Extension)