Cleanup after upgrade to .NET Framework 4.8

Signed-off-by: Simon Rozman <[email protected]>
Amebis · Apr 8, 2021 · cac36a6 · cac36a6
1 parent 5439d1b
commit cac36a6
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 38 deletions.
diff --git a/LetsConnect.Client/LetsConnect.Client.csproj b/LetsConnect.Client/LetsConnect.Client.csproj
@@ -28,12 +28,9 @@
   <ItemGroup>
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net45\Prism.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>

diff --git a/LetsConnect.Client/packages.config b/LetsConnect.Client/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net48" />
 </packages>
diff --git a/eduEd25519 b/eduEd25519
diff --git a/eduEx b/eduEx
diff --git a/eduOAuth b/eduOAuth
diff --git a/eduVPN.Client/eduVPN.Client.csproj b/eduVPN.Client/eduVPN.Client.csproj
@@ -28,12 +28,9 @@
   <ItemGroup>
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net45\Prism.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>

diff --git a/eduVPN.Client/packages.config b/eduVPN.Client/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net48" />
 </packages>
diff --git a/eduVPN.Tests/eduVPN.Tests.csproj b/eduVPN.Tests/eduVPN.Tests.csproj
@@ -41,9 +41,6 @@
       <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net45\Prism.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.XML" />
     <Reference Include="WindowsBase" />

diff --git a/eduVPN.Tests/packages.config b/eduVPN.Tests/packages.config
@@ -8,6 +8,5 @@
 <packages>
   <package id="MSTest.TestAdapter" version="2.2.3" targetFramework="net48" />
   <package id="MSTest.TestFramework" version="2.2.3" targetFramework="net48" />
-  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net48" />
 </packages>
diff --git a/eduVPN.Views/eduVPN.Views.csproj b/eduVPN.Views/eduVPN.Views.csproj
@@ -24,15 +24,12 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net45\Prism.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />

diff --git a/eduVPN.Views/packages.config b/eduVPN.Views/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net48" />
 </packages>
diff --git a/eduVPN/eduVPN.csproj b/eduVPN/eduVPN.csproj
@@ -24,15 +24,12 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="Prism, Version=8.0.0.1909, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net45\Prism.dll</HintPath>
+      <HintPath>$(SolutionDir)packages\Prism.Core.8.0.0.1909\lib\net47\Prism.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>$(SolutionDir)packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.XML" />

diff --git a/eduVPN/packages.config b/eduVPN/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net45" requireReinstallation="true" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net45" requireReinstallation="true" />
+  <package id="Prism.Core" version="8.0.0.1909" targetFramework="net48" />
 </packages>
diff --git a/eduVPNClient.wxs b/eduVPNClient.wxs
@@ -23,7 +23,6 @@
     <?define openvpnserv.exe.reg5.ComponentGUID = "{9C350B91-873A-4F0F-BBDD-D422071AE78C}"?>
     <?define openvpnserv.exe.reg6.ComponentGUID = "{D59FD7FA-E687-4A43-B8A2-077ECDD02B6D}"?>
     <?define openvpnserv.exe.reg7.ComponentGUID = "{2140688F-04A2-42C9-B9C8-1314B721C82D}"?>
-    <?define System.ValueTuple.dll.ComponentGUID = "{2D4A9678-39A8-4623-8903-DCA55E9C24F4}"?>
     <?define Prism.dll.ComponentGUID = "{7F1F7FAC-3959-40D5-A379-AE70762D6335}"?>
     <?define Client.exe.ComponentGUID = "{ED87A5F5-CCED-46EA-8D4E-443CA747E4D8}"?>
     <?define Client.exe.config.ComponentGUID = "{8382A373-0C73-4D16-8F33-CA9FF91C24D0}"?>
@@ -43,7 +42,6 @@
     <?define openvpnserv.exe.reg5.ComponentGUID = "{2D450249-CCD0-4C4C-AD9A-793C864FE1B7}"?>
     <?define openvpnserv.exe.reg6.ComponentGUID = "{EB68C746-5E50-4F66-9A21-2E6BB07EEA38}"?>
     <?define openvpnserv.exe.reg7.ComponentGUID = "{A40AFCF3-E0DE-4844-91CE-64D55C3FA8B5}"?>
-    <?define System.ValueTuple.dll.ComponentGUID = "{F53A7176-4E78-4EB1-BE22-24296A5925EF}"?>
     <?define Prism.dll.ComponentGUID = "{9B4F3694-9A5E-41AF-AA24-E2E5F39A48C6}"?>
     <?define Client.exe.ComponentGUID = "{0405C4A5-06F1-4B2A-8F7B-7BE66F7DD8E4}"?>
     <?define Client.exe.config.ComponentGUID = "{03C290E0-70A5-4594-9801-F51D07CCF06B}"?>
@@ -325,9 +323,6 @@
         </DirectoryRef>
 
         <DirectoryRef Id="COREDIR">
-            <Component Id="System.ValueTuple.dll" Guid="$(var.System.ValueTuple.dll.ComponentGUID)">
-                <File Source="System.ValueTuple.dll"/>
-            </Component>
             <Component Id="Prism.dll" Guid="$(var.Prism.dll.ComponentGUID)">
                 <File Source="Prism.dll"/>
             </Component>
@@ -444,7 +439,6 @@
             <ComponentRef Id="openvpnserv.exe.reg7"/>
 
             <MergeRef Id="VC150Redist"/>
-            <ComponentRef Id="System.ValueTuple.dll"/>
             <ComponentRef Id="Prism.dll"/>
             <ComponentRef Id="eduEd25519.dll"/>
             <ComponentRef Id="eduEx.dll"/>
+2 −1		eduEd25519.Tests/eduEd25519.Tests.csproj
+2 −2		eduEd25519.Tests/packages.config
+0 −1		LICENSE.spdx
+1 −4		eduOAuth.Tests/eduOAuth.Tests.csproj
+2 −3		eduOAuth.Tests/packages.config