Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert System.ValueTuple hack removal #218

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Revert System.ValueTuple hack removal #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Build/mkall.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,7 @@
<NuGottenFiles Include="$(PackagesDir)/System.Resources.Extensions.4.6.0/lib/netstandard2.0/System.Resources.Extensions.dll"/>
<NuGottenFiles Include="$(PackagesDir)/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/net461/System.Runtime.CompilerServices.Unsafe.dll"/>
<NuGottenFiles Include="$(PackagesDir)/System.Threading.Tasks.Extensions.4.5.4/lib/net461/System.Threading.Tasks.Extensions.dll"/>
<NuGottenFiles Include="$(PackagesDir)/System.ValueTuple.4.5.0/lib/net461/System.ValueTuple.dll"/>
</ItemGroup>
<Copy SourceFiles="@(NuGottenForBuildTasks)" DestinationFolder="$(MSBuildThisFileDirectory)"
SkipUnchangedFiles="true" OverwriteReadOnlyFiles="true"/>
Expand Down
1 change: 1 addition & 0 deletions Build/nuget-common/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
<package id="System.Resources.Extensions" version="4.6.0" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
<package id="TagLibSharp" version="2.2.0" targetFramework="net45" />
<package id="Tenuto" version="1.0.0.39" targetFramework="net461" />
<package id="relaxngDatatype" version="1.0.0.39" targetFramework="net461" />
Expand Down
4 changes: 4 additions & 0 deletions Src/AppForTests.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="9.0.0.0"/>
Expand Down
4 changes: 4 additions & 0 deletions Src/Common/Controls/FwControls/FwControls.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,10 @@
<HintPath>..\..\..\..\Output\Debug\icu.net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.ValueTuple">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\CommonAssemblyInfo.cs">
Expand Down
4 changes: 4 additions & 0 deletions Src/Common/FwUtils/FwUtils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@
<Reference Include="System.Configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Management" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="ViewsInterfaces, Version=4.1.0.9, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 4 additions & 0 deletions Src/Common/ScriptureUtils/ScriptureUtils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@
</Reference>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="Utilities, Version=7.4.100.10102, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Output\Debug\Utilities.dll</HintPath>
Expand Down
4 changes: 2 additions & 2 deletions Src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<!-- .Net Framework projects which reference netstandard2.0 end up copying a bad version of System.ValueTuple -->
<!-- Rather than try to fix it here and there we'll just go nuclear and copy the right one in after every project -->
<!-- <Target Name="CopyCorrectSystemValueTuple" AfterTargets="Build">
<Target Name="CopyCorrectSystemValueTuple" AfterTargets="Build">
<ItemGroup>
<TupleAssembly Include="$(MSBuildThisFileDirectory)/../packages/System.ValueTuple.4.5.0/lib/net461/System.ValueTuple.dll" />
</ItemGroup>
Expand All @@ -10,5 +10,5 @@
Text="System.ValueTuple not found in the packages folder."
Condition="!Exists('$(MSBuildThisFileDirectory)/../packages/System.ValueTuple.4.5.0/lib/net461/System.ValueTuple.dll')" />
<Copy SourceFiles="@(TupleAssembly)" DestinationFolder="$(OutDir)" />
</Target> -->
</Target>
</Project>
3 changes: 3 additions & 0 deletions Src/FwCoreDlgs/FwCoreDlgs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
<HintPath>..\..\Output\Debug\SIL.Windows.Forms.WritingSystems.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="ViewsInterfaces">
<Name>ViewsInterfaces</Name>
<SpecificVersion>False</SpecificVersion>
Expand Down
3 changes: 3 additions & 0 deletions Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@
<Reference Include="SIL.WritingSystems.Tests">
<HintPath>..\..\..\Output\Debug\SIL.WritingSystems.Tests.dll</HintPath>
</Reference>
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml" />
<Reference Include="ViewsInterfaces">
<Name>ViewsInterfaces</Name>
Expand Down
3 changes: 3 additions & 0 deletions Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions Src/LexText/ParserCore/ParserCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@
<HintPath>..\..\..\Output\Debug\SIL.Machine.dll</HintPath>
</Reference>
<Reference Include="netstandard" />
<Reference Include="System.ValueTuple">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="SIL.WritingSystems, Version=2.6.0.0, Culture=neutral, PublicKeyToken=cab3c8c5232dfcf2, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Output\Debug\SIL.WritingSystems.dll</HintPath>
Expand Down
3 changes: 3 additions & 0 deletions Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down
Loading