Fix references and dependencies

rsdn · Aug 21, 2017 · a7b6226 · a7b6226
1 parent 3a41e51
commit a7b6226
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 13 deletions.
diff --git a/Blocks/nuget/CodeJam.Blocks.nuspec b/Blocks/nuget/CodeJam.Blocks.nuspec
@@ -35,8 +35,12 @@
 		<file src="..\src\bin\Release.4.6\CodeJam.Blocks.pdb" target="lib\net46" />
 		<file src="..\src\bin\Release.4.6\CodeJam.Blocks.xml" target="lib\net46" />
 
-		<file src="..\src\bin\Release.4.6\CodeJam.Blocks.dll" target="lib\net47" />
-		<file src="..\src\bin\Release.4.6\CodeJam.Blocks.pdb" target="lib\net47" />
-		<file src="..\src\bin\Release.4.6\CodeJam.Blocks.xml" target="lib\net47" />
+		<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.dll" target="lib\net461" />
+		<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.pdb" target="lib\net461" />
+		<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.xml" target="lib\net461" />
+
+		<file src="..\src\bin\Release.4.7\CodeJam.Blocks.dll" target="lib\net47" />
+		<file src="..\src\bin\Release.4.7\CodeJam.Blocks.pdb" target="lib\net47" />
+		<file src="..\src\bin\Release.4.7\CodeJam.Blocks.xml" target="lib\net47" />
 	</files>
 </package>
diff --git a/Blocks/src/CodeJam.Blocks.csproj b/Blocks/src/CodeJam.Blocks.csproj
@@ -91,9 +91,6 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -108,7 +105,20 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW462'))" />
+		<When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW46'))">
+			<ItemGroup>
+				<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+					<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+				</Reference>
+			</ItemGroup>
+		</When>
+	  <When Condition="!$(DefineConstants.Contains('FW46')) AND $(DefineConstants.Contains('FW462'))">
+		  <ItemGroup>
+				<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+					<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+				</Reference>
+		  </ItemGroup>
+	  </When>
   </Choose>
   <ItemGroup>
     <None Include="Compile.cmd">

diff --git a/Blocks/src/packages.config b/Blocks/src/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
+	<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
 </packages>
diff --git a/Main/nuget/CodeJam.Main.nuspec b/Main/nuget/CodeJam.Main.nuspec
@@ -19,6 +19,9 @@
 			<group targetFramework="net40">
 			</group>
 			<group targetFramework="net45">
+				<dependency id="System.ValueTuple" version="4.3.1" />
+			</group>
+			<group targetFramework="net461">
 				<dependency id="System.ValueTuple" version="4.4.0" />
 			</group>
 			<group targetFramework="net47">
@@ -44,6 +47,10 @@
 		<file src="..\src\bin\Release.4.6\CodeJam.pdb" target="lib\net46" />
 		<file src="..\src\bin\Release.4.6\CodeJam.xml" target="lib\net46" />
 
+		<file src="..\src\bin\Release.4.6.1\CodeJam.dll" target="lib\net461" />
+		<file src="..\src\bin\Release.4.6.1\CodeJam.pdb" target="lib\net461" />
+		<file src="..\src\bin\Release.4.6.1\CodeJam.xml" target="lib\net461" />
+
 		<file src="..\src\bin\Release.4.7\CodeJam.dll" target="lib\net47" />
 		<file src="..\src\bin\Release.4.7\CodeJam.pdb" target="lib\net47" />
 		<file src="..\src\bin\Release.4.7\CodeJam.xml" target="lib\net47" />

diff --git a/Main/src/CodeJam.Main.csproj b/Main/src/CodeJam.Main.csproj
@@ -44,9 +44,6 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
@@ -61,7 +58,20 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW462'))" />
+    <When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW46'))">
+      <ItemGroup>
+        <Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+          <HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
+    <When Condition="!$(DefineConstants.Contains('FW46')) AND $(DefineConstants.Contains('FW462'))">
+      <ItemGroup>
+        <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+          <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+        </Reference>
+      </ItemGroup>
+    </When>
   </Choose>
   <ItemGroup>
     <Compile Include="..\..\Jetbrains.Annotations.cs">

diff --git a/Main/src/Strings/StringExtensions.cs b/Main/src/Strings/StringExtensions.cs
@@ -330,7 +330,7 @@ public static unsafe string ToHexString([NotNull] this byte[] data, [CanBeNull]
 		/// </returns>
 		[NotNull]
 		[Pure]
-		public static string Unquote([NotNull] this string arg) => Unquote(arg, out _);
+		public static string Unquote([NotNull] this string arg) => Unquote(arg, out var _);
 
 		/// <summary>
 		/// Remove one set of leading and trailing double quote characters, if both are present.