Skip to content

Commit a7b6226

Browse files
andrewvkandrewvk
committed
Fix references and dependencies
1 parent 3a41e51 commit a7b6226

File tree

6 files changed

+44
-13
lines changed

6 files changed

+44
-13
lines changed

‎Blocks/nuget/CodeJam.Blocks.nuspec

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@
3535
<file src="..\src\bin\Release.4.6\CodeJam.Blocks.pdb" target="lib\net46" />
3636
<file src="..\src\bin\Release.4.6\CodeJam.Blocks.xml" target="lib\net46" />
3737

38-
<file src="..\src\bin\Release.4.6\CodeJam.Blocks.dll" target="lib\net47" />
39-
<file src="..\src\bin\Release.4.6\CodeJam.Blocks.pdb" target="lib\net47" />
40-
<file src="..\src\bin\Release.4.6\CodeJam.Blocks.xml" target="lib\net47" />
38+
<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.dll" target="lib\net461" />
39+
<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.pdb" target="lib\net461" />
40+
<file src="..\src\bin\Release.4.6.1\CodeJam.Blocks.xml" target="lib\net461" />
41+
42+
<file src="..\src\bin\Release.4.7\CodeJam.Blocks.dll" target="lib\net47" />
43+
<file src="..\src\bin\Release.4.7\CodeJam.Blocks.pdb" target="lib\net47" />
44+
<file src="..\src\bin\Release.4.7\CodeJam.Blocks.xml" target="lib\net47" />
4145
</files>
4246
</package>

‎Blocks/src/CodeJam.Blocks.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@
9191
</ItemGroup>
9292
<ItemGroup>
9393
<Reference Include="System" />
94-
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
95-
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
96-
</Reference>
9794
<Reference Include="System.XML" />
9895
<Reference Include="System.Xml.Linq" />
9996
</ItemGroup>
@@ -108,7 +105,20 @@
108105
</When>
109106
</Choose>
110107
<Choose>
111-
<When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW462'))" />
108+
<When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW46'))">
109+
<ItemGroup>
110+
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
111+
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
112+
</Reference>
113+
</ItemGroup>
114+
</When>
115+
<When Condition="!$(DefineConstants.Contains('FW46')) AND $(DefineConstants.Contains('FW462'))">
116+
<ItemGroup>
117+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
118+
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
119+
</Reference>
120+
</ItemGroup>
121+
</When>
112122
</Choose>
113123
<ItemGroup>
114124
<None Include="Compile.cmd">

‎Blocks/src/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="System.ValueTuple" version="4.4.0" targetFramework="net452" />
3+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
44
</packages>

‎Main/nuget/CodeJam.Main.nuspec

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group targetFramework="net40">
2020
</group>
2121
<group targetFramework="net45">
22+
<dependency id="System.ValueTuple" version="4.3.1" />
23+
</group>
24+
<group targetFramework="net461">
2225
<dependency id="System.ValueTuple" version="4.4.0" />
2326
</group>
2427
<group targetFramework="net47">
@@ -44,6 +47,10 @@
4447
<file src="..\src\bin\Release.4.6\CodeJam.pdb" target="lib\net46" />
4548
<file src="..\src\bin\Release.4.6\CodeJam.xml" target="lib\net46" />
4649

50+
<file src="..\src\bin\Release.4.6.1\CodeJam.dll" target="lib\net461" />
51+
<file src="..\src\bin\Release.4.6.1\CodeJam.pdb" target="lib\net461" />
52+
<file src="..\src\bin\Release.4.6.1\CodeJam.xml" target="lib\net461" />
53+
4754
<file src="..\src\bin\Release.4.7\CodeJam.dll" target="lib\net47" />
4855
<file src="..\src\bin\Release.4.7\CodeJam.pdb" target="lib\net47" />
4956
<file src="..\src\bin\Release.4.7\CodeJam.xml" target="lib\net47" />

‎Main/src/CodeJam.Main.csproj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
<Reference Include="System" />
4545
<Reference Include="System.ComponentModel.DataAnnotations" />
4646
<Reference Include="System.Core" />
47-
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
48-
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
49-
</Reference>
5047
<Reference Include="System.Xml" />
5148
<Reference Include="System.Xml.Linq" />
5249
</ItemGroup>
@@ -61,7 +58,20 @@
6158
</When>
6259
</Choose>
6360
<Choose>
64-
<When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW462'))" />
61+
<When Condition="!$(DefineConstants.Contains('FW40')) AND $(DefineConstants.Contains('FW46'))">
62+
<ItemGroup>
63+
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
64+
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
65+
</Reference>
66+
</ItemGroup>
67+
</When>
68+
<When Condition="!$(DefineConstants.Contains('FW46')) AND $(DefineConstants.Contains('FW462'))">
69+
<ItemGroup>
70+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
72+
</Reference>
73+
</ItemGroup>
74+
</When>
6575
</Choose>
6676
<ItemGroup>
6777
<Compile Include="..\..\Jetbrains.Annotations.cs">

‎Main/src/Strings/StringExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ public static unsafe string ToHexString([NotNull] this byte[] data, [CanBeNull]
330330
/// </returns>
331331
[NotNull]
332332
[Pure]
333-
public static string Unquote([NotNull] this string arg) => Unquote(arg, out _);
333+
public static string Unquote([NotNull] this string arg) => Unquote(arg, out var _);
334334

335335
/// <summary>
336336
/// Remove one set of leading and trailing double quote characters, if both are present.

0 commit comments

Comments
 (0)