Revert System.ValueTuple hack removal

sillsdev · Nov 26, 2024 · bf816ee · bf816ee
1 parent 439a403
commit bf816ee
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 2 deletions.
diff --git a/Build/mkall.targets b/Build/mkall.targets
@@ -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"/>

diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config
@@ -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" />

diff --git a/Src/AppForTests.config b/Src/AppForTests.config
@@ -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"/>

diff --git a/Src/Common/Controls/FwControls/FwControls.csproj b/Src/Common/Controls/FwControls/FwControls.csproj
@@ -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">

diff --git a/Src/Common/FwUtils/FwUtils.csproj b/Src/Common/FwUtils/FwUtils.csproj
@@ -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>

diff --git a/Src/Common/ScriptureUtils/ScriptureUtils.csproj b/Src/Common/ScriptureUtils/ScriptureUtils.csproj
@@ -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>

diff --git a/Src/Directory.Build.targets b/Src/Directory.Build.targets
@@ -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>
@@ -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>
diff --git a/Src/FwCoreDlgs/FwCoreDlgs.csproj b/Src/FwCoreDlgs/FwCoreDlgs.csproj
@@ -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>

diff --git a/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj b/Src/FwCoreDlgs/FwCoreDlgsTests/FwCoreDlgsTests.csproj
@@ -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>

diff --git a/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj b/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
@@ -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>

diff --git a/Src/LexText/ParserCore/ParserCore.csproj b/Src/LexText/ParserCore/ParserCore.csproj
@@ -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>

diff --git a/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj b/Src/Paratext8Plugin/ParaText8PluginTests/Paratext8PluginTests.csproj
@@ -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" />