From c72cb4635043ec6a2f9fdf392cbcd87d9762b369 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Wed, 20 Feb 2019 10:54:52 +0100
Subject: [PATCH] fix missing nuget properties (Fix #990)

---
 .../Google.OrTools.FSharp.fsproj.in           | 21 +++++++++++-----
 ...Google.OrTools.runtime.linux-x64.csproj.in | 21 +++++++++++-----
 .../Google.OrTools.runtime.osx-x64.csproj.in  | 23 ++++++++++++-----
 .../Google.OrTools.runtime.win-x64.csproj.in  | 25 +++++++++++++------
 ortools/dotnet/Google.OrTools.sln             |  1 -
 .../Google.OrTools/Google.OrTools.csproj.in   | 22 +++++++++++-----
 6 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/ortools/dotnet/Google.OrTools.FSharp/Google.OrTools.FSharp.fsproj.in b/ortools/dotnet/Google.OrTools.FSharp/Google.OrTools.FSharp.fsproj.in
index 2d16aa07c9..24cdf6cc5f 100644
--- a/ortools/dotnet/Google.OrTools.FSharp/Google.OrTools.FSharp.fsproj.in
+++ b/ortools/dotnet/Google.OrTools.FSharp/Google.OrTools.FSharp.fsproj.in
@@ -3,18 +3,27 @@
     <OutputType>Library</OutputType>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>Google.OrTools.FSharp</AssemblyName>
-
-    <!-- Nuget Properties-->
-    <PackageId>Google.OrTools.FSharp</PackageId>
     <Version>@PROJECT_VERSION@</Version>
-    <Authors>Google LLC</Authors>
+
+    <!-- Nuget Properties -->
+    <MinClientVersion>4.1.0</MinClientVersion>
     <Description>.NET F# wrapper for the Operations Research Tools project</Description>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Laurent Perron</Authors>
+    <Company>Google LLC</Company>
     <Copyright>Copyright 2018 Google LLC</Copyright>
-    <PackageLicenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</PackageLicenseUrl>
+    <!-- Pack Option -->
+    <Title>Google.OrTools.FSharp v@PROJECT_VERSION@</Title>
+    <PackageId>Google.OrTools.FSharp</PackageId>
+    <PackageTags>native;math;LinearSolver;LinearProgramming;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageIconUrl>https://developers.google.com/optimization/images/orLogo.png</PackageIconUrl>
     <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
-    <PackageTags>math;LinearSolver;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageOutputPath>../../../packages</PackageOutputPath>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/google/or-tools</RepositoryUrl>
 
     <AssemblyKeyFileAttribute>../../../bin/or-tools.snk</AssemblyKeyFileAttribute>
     <SignAssembly>true</SignAssembly>
diff --git a/ortools/dotnet/Google.OrTools.runtime.linux-x64/Google.OrTools.runtime.linux-x64.csproj.in b/ortools/dotnet/Google.OrTools.runtime.linux-x64/Google.OrTools.runtime.linux-x64.csproj.in
index a7677e71b5..357a7e06ec 100644
--- a/ortools/dotnet/Google.OrTools.runtime.linux-x64/Google.OrTools.runtime.linux-x64.csproj.in
+++ b/ortools/dotnet/Google.OrTools.runtime.linux-x64/Google.OrTools.runtime.linux-x64.csproj.in
@@ -4,18 +4,27 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <AssemblyName>Google.OrTools</AssemblyName>
-
-    <!-- Nuget Properties-->
-    <PackageId>Google.OrTools.runtime.linux-x64</PackageId>
     <Version>@PROJECT_VERSION@</Version>
-    <Authors>Google LLC</Authors>
+
+    <!-- Nuget Properties -->
+    <MinClientVersion>4.1.0</MinClientVersion>
     <Description>.NET native wrapper for the Operations Research Tools project</Description>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Laurent Perron</Authors>
+    <Company>Google LLC</Company>
     <Copyright>Copyright 2018 Google LLC</Copyright>
-    <PackageLicenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</PackageLicenseUrl>
+    <!-- Pack Option -->
+    <Title>Google.OrTools linux-x64 v@PROJECT_VERSION@</Title>
+    <PackageId>Google.OrTools.runtime.linux-x64</PackageId>
+    <PackageTags>native;math;LinearSolver;LinearProgramming;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageIconUrl>https://developers.google.com/optimization/images/orLogo.png</PackageIconUrl>
     <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
-    <PackageTags>native;math;LinearSolver;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageOutputPath>../../../packages</PackageOutputPath>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/google/or-tools</RepositoryUrl>
 
     <AssemblyOriginatorKeyFile>../../../bin/or-tools.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/ortools/dotnet/Google.OrTools.runtime.osx-x64/Google.OrTools.runtime.osx-x64.csproj.in b/ortools/dotnet/Google.OrTools.runtime.osx-x64/Google.OrTools.runtime.osx-x64.csproj.in
index 32a7ea45be..7ec9a1778e 100644
--- a/ortools/dotnet/Google.OrTools.runtime.osx-x64/Google.OrTools.runtime.osx-x64.csproj.in
+++ b/ortools/dotnet/Google.OrTools.runtime.osx-x64/Google.OrTools.runtime.osx-x64.csproj.in
@@ -4,22 +4,33 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <AssemblyName>Google.OrTools</AssemblyName>
-
-    <!-- Nuget Properties-->
-    <PackageId>Google.OrTools.runtime.osx-x64</PackageId>
     <Version>@PROJECT_VERSION@</Version>
-    <Authors>Google LLC</Authors>
+
+    <!-- Nuget Properties -->
+    <MinClientVersion>4.1.0</MinClientVersion>
     <Description>.NET native wrapper for the Operations Research Tools project</Description>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Laurent Perron</Authors>
+    <Company>Google LLC</Company>
     <Copyright>Copyright 2018 Google LLC</Copyright>
-    <PackageLicenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</PackageLicenseUrl>
+    <!-- Pack Option -->
+    <Title>Google.OrTools osx-x64 v@PROJECT_VERSION@</Title>
+    <PackageId>Google.OrTools.runtime.osx-x64</PackageId>
+    <PackageTags>native;math;LinearSolver;LinearProgramming;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageIconUrl>https://developers.google.com/optimization/images/orLogo.png</PackageIconUrl>
     <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
-    <PackageTags>native;math;LinearSolver;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageOutputPath>../../../packages</PackageOutputPath>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/google/or-tools</RepositoryUrl>
 
     <AssemblyOriginatorKeyFile>../../../bin/or-tools.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+
+    <!-- Build Properties -->
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <UseSharedCompilation>false</UseSharedCompilation>
     <EnableDefaultItems>false</EnableDefaultItems>
diff --git a/ortools/dotnet/Google.OrTools.runtime.win-x64/Google.OrTools.runtime.win-x64.csproj.in b/ortools/dotnet/Google.OrTools.runtime.win-x64/Google.OrTools.runtime.win-x64.csproj.in
index 8626b0e430..9660751931 100644
--- a/ortools/dotnet/Google.OrTools.runtime.win-x64/Google.OrTools.runtime.win-x64.csproj.in
+++ b/ortools/dotnet/Google.OrTools.runtime.win-x64/Google.OrTools.runtime.win-x64.csproj.in
@@ -4,22 +4,33 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <AssemblyName>Google.OrTools</AssemblyName>
-
-    <!-- Nuget Properties-->
-    <PackageId>Google.OrTools.runtime.win-x64</PackageId>
     <Version>@PROJECT_VERSION@</Version>
-    <Authors>Google LLC</Authors>
+
+    <!-- Nuget Properties -->
+    <MinClientVersion>4.1.0</MinClientVersion>
     <Description>.NET native wrapper for the Operations Research Tools project</Description>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Laurent Perron</Authors>
+    <Company>Google LLC</Company>
     <Copyright>Copyright 2018 Google LLC</Copyright>
-    <PackageLicenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</PackageLicenseUrl>
+    <!-- Pack Option -->
+    <Title>Google.OrTools win-x64 v@PROJECT_VERSION@</Title>
+    <PackageId>Google.OrTools.runtime.win-x64</PackageId>
+    <PackageTags>native;math;LinearSolver;LinearProgramming;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageIconUrl>https://developers.google.com/optimization/images/orLogo.png</PackageIconUrl>
     <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
-    <PackageTags>native;math;LinearSolver;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageOutputPath>../../../packages</PackageOutputPath>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/google/or-tools</RepositoryUrl>
 
     <AssemblyOriginatorKeyFile>../../../bin/or-tools.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+
+    <!-- Build Properties -->
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <UseSharedCompilation>false</UseSharedCompilation>
     <EnableDefaultItems>false</EnableDefaultItems>
diff --git a/ortools/dotnet/Google.OrTools.sln b/ortools/dotnet/Google.OrTools.sln
index 294792acdc..bb55223852 100644
--- a/ortools/dotnet/Google.OrTools.sln
+++ b/ortools/dotnet/Google.OrTools.sln
@@ -7,7 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.linu
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.osx-x64",   "Google.OrTools.runtime.osx-x64\Google.OrTools.runtime.osx-x64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.runtime.win-x64",   "Google.OrTools.runtime.win-x64\Google.OrTools.runtime.win-x64.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools",   "Google.OrTools\Google.OrTools.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.Tests",   "Google.OrTools.Tests\Google.OrTools.Tests.csproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.FSharp",   "Google.OrTools.FSharp\Google.OrTools.FSharp.fsproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.OrTools.FSharp.Tests",   "Google.OrTools.FSharp.Tests\Google.OrTools.FSharp.Tests.fsproj", "{FC646C34-8541-427D-B9F6-1247798F4574}"
 EndProject
diff --git a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
index f24327d67c..ec665c61ef 100644
--- a/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
+++ b/ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
@@ -4,18 +4,28 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <AssemblyName>Google.OrTools</AssemblyName>
-
-    <!-- Nuget Properties-->
-    <PackageId>Google.OrTools</PackageId>
     <Version>@PROJECT_VERSION@</Version>
-    <Authors>Google LLC</Authors>
+
+    <!-- Nuget Properties -->
+    <MinClientVersion>4.1.0</MinClientVersion>
     <Description>.NET wrapper for the Operations Research Tools project</Description>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <Authors>Laurent Perron</Authors>
+    <Company>Google LLC</Company>
     <Copyright>Copyright 2018 Google LLC</Copyright>
-    <PackageLicenseUrl>https://github.com/google/or-tools/blob/master/LICENSE-2.0.txt</PackageLicenseUrl>
-    <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
+    <!-- Pack Option -->
+    <Title>Google.OrTools v@PROJECT_VERSION@</Title>
+    <PackageId>Google.OrTools</PackageId>
     <PackageTags>native;math;LinearSolver;LinearProgramming;ConstraintSolver;ConstraintProgramming</PackageTags>
+    <PackageIconUrl>https://developers.google.com/optimization/images/orLogo.png</PackageIconUrl>
+    <PackageProjectUrl>https://developers.google.com/optimization</PackageProjectUrl>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageOutputPath>../../../packages</PackageOutputPath>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/google/or-tools</RepositoryUrl>
+    <DevelopmentDependency>false</DevelopmentDependency>
 
     <AssemblyOriginatorKeyFile>../../../bin/or-tools.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>