add sat folder to netstandard library

fix signing key path and target
This commit is contained in:
ziad
2018-02-08 06:10:06 -08:00
parent 6207fbed49
commit 2f368aaa60
6 changed files with 17 additions and 5 deletions

3
.gitignore vendored
View File

@@ -75,4 +75,5 @@ cache/
**/.vscode/*
.DS_Store
!tools/netstandard/CreateSigningKey/CreateSigningKey.dll
tools/netstandard/CreateSigningKey/bin
tools/netstandard/CreateSigningKey/obj

View File

@@ -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): \

View File

@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
</Project>

View File

@@ -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.");

View File

@@ -49,6 +49,10 @@
<Link>graph\%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="..\..\ortools\com\google\ortools\sat\*.cs">
<Link>sat\%(Filename)%(Extension)</Link>
</Compile>
<Compile Include="..\..\ortools\gen\com\google\ortools\sat\*.cs">
<Link>sat\%(Filename)%(Extension)</Link>
</Compile>