Merge pull request #14 from InRule/issue/2362-shepherd-release

Update projects to use InRule 5.6.0 and .NET 4.7.2
InRule · Jun 23, 2020 · e7b4a2a · e7b4a2a
2 parents c18ff99 + e908cc9
commit e7b4a2a
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 45 deletions.
diff --git a/InRule.Runtime.Metrics.AzureTableStorage/InRule.Runtime.Metrics.AzureTableStorage.csproj b/InRule.Runtime.Metrics.AzureTableStorage/InRule.Runtime.Metrics.AzureTableStorage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <AssemblyName>InRule.Runtime.Metrics.AzureTableStorage</AssemblyName>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>KeyPair.snk</AssemblyOriginatorKeyFile>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="InRule.Runtime" Version="5.5.1" />
+    <PackageReference Include="InRule.Runtime" Version="5.6.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>

diff --git a/...trics.SqlServer.IntegrationTests/InRule.Runtime.Metrics.SqlServer.IntegrationTests.csproj b/...trics.SqlServer.IntegrationTests/InRule.Runtime.Metrics.SqlServer.IntegrationTests.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="InRule.Runtime" Version="5.5.1" />
+    <PackageReference Include="InRule.Runtime" Version="5.6.0" />
     <PackageReference Include="nunit" Version="3.11.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />

diff --git a/InRule.Runtime.Metrics.SqlServer/InRule.Runtime.Metrics.SqlServer.csproj b/InRule.Runtime.Metrics.SqlServer/InRule.Runtime.Metrics.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <Authors>InRule Technology, Inc.</Authors>
     <Company>InRule Technology, Inc.</Company>
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="dbup-sqlserver" Version="4.2.0" />
-    <PackageReference Include="InRule.Runtime" Version="5.5.1" />
+    <PackageReference Include="InRule.Runtime" Version="5.6.0" />
     <PackageReference Include="LibLog" Version="5.0.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Samples/InRule.Runtime.Metrics.Csv/InRule.Runtime.Metrics.Csv.csproj b/Samples/InRule.Runtime.Metrics.Csv/InRule.Runtime.Metrics.Csv.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>InRule.Runtime.Metrics.Csv</RootNamespace>
     <AssemblyName>InRule.Runtime.Metrics.Csv</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -31,17 +32,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="InRule.Common, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Common.5.5.1\lib\net461\InRule.Common.dll</HintPath>
+    <Reference Include="InRule.Common, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Common.5.6.0\lib\net472\InRule.Common.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Repository, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Repository.5.5.1\lib\net461\InRule.Repository.dll</HintPath>
+    <Reference Include="InRule.Repository, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Repository.5.6.0\lib\net472\InRule.Repository.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Repository.XmlSerializers, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Repository.5.5.1\lib\net461\InRule.Repository.XmlSerializers.dll</HintPath>
+    <Reference Include="InRule.Repository.XmlSerializers, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Repository.5.6.0\lib\net472\InRule.Repository.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Runtime, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Runtime.5.5.1\lib\net461\InRule.Runtime.dll</HintPath>
+    <Reference Include="InRule.Runtime, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Runtime.5.6.0\lib\net472\InRule.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -50,7 +51,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

diff --git a/Samples/InRule.Runtime.Metrics.Csv/app.config b/Samples/InRule.Runtime.Metrics.Csv/app.config
@@ -8,4 +8,7 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+  </startup>
+</configuration>
diff --git a/Samples/InRule.Runtime.Metrics.Csv/packages.config b/Samples/InRule.Runtime.Metrics.Csv/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="InRule.Common" version="5.5.1" targetFramework="net462" />
-  <package id="InRule.Repository" version="5.5.1" targetFramework="net462" />
-  <package id="InRule.Runtime" version="5.5.1" targetFramework="net462" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net462" />
+  <package id="InRule.Common" version="5.6.0" targetFramework="net472" />
+  <package id="InRule.Repository" version="5.6.0" targetFramework="net472" />
+  <package id="InRule.Runtime" version="5.6.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
 </packages>
diff --git a/Samples/InRule.Runtime.Metrics.TestHarness/App.config b/Samples/InRule.Runtime.Metrics.TestHarness/App.config
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
   </startup>
   <appSettings>
     <add key="OutputDirectory" value="../../Output/" />
     <add key="RuleAppPath" value="../../RuleApps/Invoice.ruleappx" />
     <add key="DataPath" value="../../Data/" />
     <add key="TopEntityName" value="Invoice" />
   </appSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Samples/InRule.Runtime.Metrics.TestHarness/InRule.Runtime.Metrics.TestHarness.csproj b/Samples/InRule.Runtime.Metrics.TestHarness/InRule.Runtime.Metrics.TestHarness.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>InRule.Runtime.Metrics.TestHarness</RootNamespace>
     <AssemblyName>InRule.Runtime.Metrics.TestHarness</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -36,17 +36,17 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="InRule.Common, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Common.5.5.1\lib\net461\InRule.Common.dll</HintPath>
+    <Reference Include="InRule.Common, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Common.5.6.0\lib\net472\InRule.Common.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Repository, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Repository.5.5.1\lib\net461\InRule.Repository.dll</HintPath>
+    <Reference Include="InRule.Repository, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Repository.5.6.0\lib\net472\InRule.Repository.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Repository.XmlSerializers, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Repository.5.5.1\lib\net461\InRule.Repository.XmlSerializers.dll</HintPath>
+    <Reference Include="InRule.Repository.XmlSerializers, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Repository.5.6.0\lib\net472\InRule.Repository.XmlSerializers.dll</HintPath>
     </Reference>
-    <Reference Include="InRule.Runtime, Version=5.5.1.225, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
-      <HintPath>..\packages\InRule.Runtime.5.5.1\lib\net461\InRule.Runtime.dll</HintPath>
+    <Reference Include="InRule.Runtime, Version=5.6.0.232, Culture=neutral, PublicKeyToken=1feb8dd25b1ceb6b, processorArchitecture=MSIL">
+      <HintPath>..\packages\InRule.Runtime.5.6.0\lib\net472\InRule.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -55,7 +55,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\InRule.Runtime.Metrics.Csv\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -107,9 +107,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/Samples/InRule.Runtime.Metrics.TestHarness/Properties/Resources.Designer.cs b/Samples/InRule.Runtime.Metrics.TestHarness/Properties/Resources.Designer.cs
diff --git a/Samples/InRule.Runtime.Metrics.TestHarness/Properties/Settings.Designer.cs b/Samples/InRule.Runtime.Metrics.TestHarness/Properties/Settings.Designer.cs
diff --git a/Samples/InRule.Runtime.Metrics.TestHarness/packages.config b/Samples/InRule.Runtime.Metrics.TestHarness/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="InRule.Common" version="5.5.1" targetFramework="net462" />
-  <package id="InRule.Repository" version="5.5.1" targetFramework="net462" />
-  <package id="InRule.Runtime" version="5.5.1" targetFramework="net462" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net462" />
+  <package id="InRule.Common" version="5.6.0" targetFramework="net472" />
+  <package id="InRule.Repository" version="5.6.0" targetFramework="net472" />
+  <package id="InRule.Runtime" version="5.6.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net472" />
 </packages>
diff --git a/build.cake b/build.cake
@@ -90,8 +90,8 @@ Task("Build and Publish Metrics Adapter Libraries")
     DotNetCorePublish(file.ToString(), settings);
   }
 
-  Warning("Publishing for net461");
-  settings.Framework = "net461";
+  Warning("Publishing for net472");
+  settings.Framework = "net472";
   DotNetCorePublish(solution, settings);
 });