Skip to content

Commit b269ca6

Browse files
authored
Merge pull request #3365 from retailcoder/next
Added System.ValueTuple to all projects
2 parents 17e364a + 60cf5d8 commit b269ca6

File tree

18 files changed

+59
-6
lines changed

18 files changed

+59
-6
lines changed

RetailCoder.VBE/Rubberduck.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,9 @@
296296
<Reference Include="System.Printing" />
297297
<Reference Include="System.Runtime.Remoting" />
298298
<Reference Include="System.Runtime.Serialization" />
299+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
300+
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
301+
</Reference>
299302
<Reference Include="System.Windows.Forms" />
300303
<Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
301304
<HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>

RetailCoder.VBE/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<package id="Ninject.Extensions.NamedScope" version="3.2.0.0" targetFramework="net45" />
1515
<package id="NLog" version="4.0.1" targetFramework="net45" />
1616
<package id="NLog.Schema" version="4.0.1" targetFramework="net45" />
17+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
1718
<package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net45" />
1819
</packages>

Rubberduck.Inspections/Rubberduck.Inspections.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
</Reference>
4545
<Reference Include="System" />
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>
4750
<Reference Include="System.Windows.Forms" />
4851
<Reference Include="System.Xml.Linq" />
4952
<Reference Include="System.Data.DataSetExtensions" />

Rubberduck.Inspections/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<packages>
33
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net452" />
44
<package id="NLog" version="4.0.1" targetFramework="net452" />
5+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
56
</packages>

Rubberduck.Parsing/Rubberduck.Parsing.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
<Reference Include="System.Core" />
5656
<Reference Include="Microsoft.CSharp" />
5757
<Reference Include="System.Runtime.Serialization" />
58+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59+
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
60+
</Reference>
5861
<Reference Include="System.Xml" />
5962
</ItemGroup>
6063
<ItemGroup>

Rubberduck.Parsing/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="Antlr4" version="4.3.0" targetFramework="net45" />
44
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net45" />
55
<package id="NLog" version="4.0.1" targetFramework="net45" />
6-
</packages>
6+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
7+
</packages>

Rubberduck.RegexAssistant/Rubberduck.RegexAssistant.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
3535
<Reference Include="System" />
3636
<Reference Include="System.Core" />
37+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
38+
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
39+
</Reference>
3740
<Reference Include="System.Xml.Linq" />
3841
<Reference Include="System.Data.DataSetExtensions" />
3942
<Reference Include="Microsoft.CSharp" />
@@ -68,6 +71,9 @@
6871
<LastGenOutput>AssistantResources.Designer.cs</LastGenOutput>
6972
</EmbeddedResource>
7073
</ItemGroup>
74+
<ItemGroup>
75+
<None Include="packages.config" />
76+
</ItemGroup>
7177
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7278
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7379
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
4+
</packages>

Rubberduck.SettingsProvider/Rubberduck.SettingsProvider.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<ItemGroup>
3333
<Reference Include="System" />
3434
<Reference Include="System.Core" />
35+
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
36+
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
37+
</Reference>
3538
<Reference Include="System.Xml.Linq" />
3639
<Reference Include="System.Data.DataSetExtensions" />
3740
<Reference Include="Microsoft.CSharp" />
@@ -45,6 +48,9 @@
4548
<Compile Include="Properties\AssemblyInfo.cs" />
4649
<Compile Include="XmlPersistanceService.cs" />
4750
</ItemGroup>
51+
<ItemGroup>
52+
<None Include="packages.config" />
53+
</ItemGroup>
4854
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
4955
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5056
Other similar extension points exist, see Microsoft.Common.targets.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
4+
</packages>

0 commit comments

Comments
 (0)