Skip to content

Commit

Permalink
7.2 -> 7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@lperron
lperron committed Aug 5, 2019
1 parent 798b280 commit 5f9a56b
Show file tree
Hide file tree
Showing 200 changed files with 368 additions and 2,337 deletions.
2 changes: 1 addition & 1 deletion Version.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
OR_TOOLS_MAJOR=7
OR_TOOLS_MINOR=2
OR_TOOLS_MINOR=3
#PRE_RELEASE=YES
4 changes: 2 additions & 2 deletions examples/contrib/3_jugs_regular.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="3_jugs_regular.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
1,700 changes: 0 additions & 1,700 deletions examples/contrib/Google.OrTools.Contrib.sln
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/contrib/SimpleProgramFSharp.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="SimpleProgramFSharp.fs" />
<PackageReference Include="Google.OrTools.FSharp" Version="7.2.*" />
<PackageReference Include="Google.OrTools.FSharp" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/a_puzzle.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="a_puzzle.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/a_round_of_golf.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="a_round_of_golf.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/all_interval.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="all_interval.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/alldifferent_except_0.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="alldifferent_except_0.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/assignment.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="assignment.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/broken_weights.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="broken_weights.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/bus_schedule.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="bus_schedule.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/circuit.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="circuit.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/circuit2.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="circuit2.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/coins3.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="coins3.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/coins_grid.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="coins_grid.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/combinatorial_auction2.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="combinatorial_auction2.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/contiguity_regular.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="contiguity_regular.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/contiguity_transition.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="contiguity_transition.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/costas_array.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="costas_array.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/covering_opl.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="covering_opl.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/crew.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="crew.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/crossword.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="crossword.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/crypta.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="crypta.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/crypto.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="crypto.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions examples/contrib/csdiet.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<LangVersion>7.2</LangVersion>
<LangVersion>7.3</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
Expand All @@ -17,6 +17,6 @@

<ItemGroup>
<Compile Include="csdiet.cs" />
<PackageReference Include="Google.OrTools" Version="7.2.*" />
<PackageReference Include="Google.OrTools" Version="7.3.*" />
</ItemGroup>
</Project>
Loading

0 comments on commit 5f9a56b

Please sign in to comment.