Merge pull request #4 from luuksommers/develop

Update to .net 4.7
luuksommers · Oct 23, 2017 · 6ae08c1 · 6ae08c1
2 parents 5600068 + e40fab0
commit 6ae08c1
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 38 deletions.
diff --git a/nuget.config b/nuget.config
@@ -3,6 +3,5 @@
 	<packageSources>
 		<add key="nuget.org" protocolVersion="3" value="https://api.nuget.org/v3/index.json"/>
 		<add key="Sitecore" value="https://sitecore.myget.org/F/sc-packages/api/v3/index.json"/>
-		<add key="Allego Shared" value="https://allego.pkgs.visualstudio.com/_packaging/Allego/nuget/v3/index.json"/>
 	</packageSources>
 </configuration>
diff --git a/src/YmlTransform/App.config b/src/YmlTransform/App.config
@@ -1,7 +1,7 @@
 <?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" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

diff --git a/src/YmlTransform/YmlTransform.csproj b/src/YmlTransform/YmlTransform.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>YmlTransform</RootNamespace>
     <AssemblyName>YmlTransform</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
@@ -57,6 +57,12 @@
     <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
     </Reference>
+    <Reference Include="System.Linq, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.4.3.0\lib\net463\System.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Linq.Expressions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
     </Reference>
@@ -84,10 +90,10 @@
     <Compile Include="YmlTransformer.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config">
+    <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/YmlTransform/packages.config b/src/YmlTransform/packages.config
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommandLineParser" version="1.9.71" targetFramework="net462" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
-  <package id="Rainbow.Core" version="1.4.2" targetFramework="net462" />
-  <package id="Rainbow.Storage.Yaml" version="1.4.2" targetFramework="net462" />
-  <package id="Sitecore.Kernel.NoReferences" version="8.2.170407" targetFramework="net462" developmentDependency="true" />
-  <package id="System.Collections" version="4.3.0" targetFramework="net462" />
-  <package id="System.Console" version="4.3.0" targetFramework="net462" />
-  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net462" />
-  <package id="System.Globalization" version="4.0.11-rc2-24027" targetFramework="net462" />
-  <package id="System.IO" version="4.3.0" targetFramework="net462" />
-  <package id="System.Linq" version="4.3.0" targetFramework="net462" />
-  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net462" />
-  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
-  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net462" />
-  <package id="System.Reflection.TypeExtensions" version="4.4.0-preview1-25305-02" targetFramework="net462" />
-  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net462" />
+  <package id="CommandLineParser" version="1.9.71" targetFramework="net47" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
+  <package id="Rainbow.Core" version="1.4.2" targetFramework="net47" />
+  <package id="Rainbow.Storage.Yaml" version="1.4.2" targetFramework="net47" />
+  <package id="Sitecore.Kernel.NoReferences" version="8.2.170407" targetFramework="net47" developmentDependency="true" />
+  <package id="System.Collections" version="4.3.0" targetFramework="net47" />
+  <package id="System.Console" version="4.3.0" targetFramework="net47" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net47" />
+  <package id="System.Globalization" version="4.3.0" targetFramework="net47" />
+  <package id="System.IO" version="4.3.0" targetFramework="net47" />
+  <package id="System.Linq" version="4.3.0" targetFramework="net47" />
+  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net47" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net47" />
+  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net47" />
+  <package id="System.Reflection.TypeExtensions" version="4.4.0-preview1-25305-02" targetFramework="net47" />
+  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net47" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net47" />
+  <package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net47" />
 </packages>
diff --git a/tests/YmlTransform.Tests/YmlTransform.Tests.csproj b/tests/YmlTransform.Tests/YmlTransform.Tests.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props')" />
+  <Import Project="..\..\packages\xunit.runner.console.2.3.0\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.0\build\xunit.runner.console.props')" />
   <Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -11,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YmlTransform.Tests</RootNamespace>
     <AssemblyName>YmlTransform.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <NuGetPackageImportStamp>
@@ -86,9 +87,6 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
@@ -99,6 +97,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\xunit.runner.console.2.3.0\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.console.2.3.0\build\xunit.runner.console.props'))" />
     <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.0\build\net20\xunit.runner.visualstudio.props'))" />
   </Target>
   <Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />

diff --git a/tests/YmlTransform.Tests/app.config b/tests/YmlTransform.Tests/app.config
@@ -18,6 +18,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Linq" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>
diff --git a/tests/YmlTransform.Tests/packages.config b/tests/YmlTransform.Tests/packages.config
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net462" />
-  <package id="xunit" version="2.3.0" targetFramework="net462" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
-  <package id="xunit.analyzers" version="0.7.0" targetFramework="net462" />
-  <package id="xunit.assert" version="2.3.0" targetFramework="net462" />
-  <package id="xunit.core" version="2.3.0" targetFramework="net462" />
-  <package id="xunit.extensibility.core" version="2.3.0" targetFramework="net462" />
-  <package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net462" />
-  <package id="xunit.runner.visualstudio" version="2.3.0" targetFramework="net462" developmentDependency="true" />
+  <package id="System.Reflection" version="4.3.0" targetFramework="net47" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net47" />
+  <package id="xunit" version="2.3.0" targetFramework="net47" />
+  <package id="xunit.abstractions" version="2.0.1" targetFramework="net47" />
+  <package id="xunit.analyzers" version="0.7.0" targetFramework="net47" />
+  <package id="xunit.assert" version="2.3.0" targetFramework="net47" />
+  <package id="xunit.core" version="2.3.0" targetFramework="net47" />
+  <package id="xunit.extensibility.core" version="2.3.0" targetFramework="net47" />
+  <package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net47" />
+  <package id="xunit.runner.console" version="2.3.0" targetFramework="net47" developmentDependency="true" />
+  <package id="xunit.runner.visualstudio" version="2.3.0" targetFramework="net47" developmentDependency="true" />
 </packages>