From 7879531827c33ae2f75ea71b68f36c9b21dd5a12 Mon Sep 17 00:00:00 2001
From: Dan Siegel <me@dansiegel.net>
Date: Sat, 8 Jul 2023 21:53:43 -0600
Subject: [PATCH] chore: revert changes - add back support for net461

---
 src/Prism.Core/Prism.Core.csproj                 | 7 ++++++-
 src/Prism.Core/Properties/IsExternalInit.cs      | 2 +-
 src/Prism.Events/Prism.Events.csproj             | 2 +-
 src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj | 2 +-
 src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj   | 2 +-
 src/Wpf/Prism.Wpf/Prism.Wpf.csproj               | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Prism.Core/Prism.Core.csproj b/src/Prism.Core/Prism.Core.csproj
index 6d1702cb32..3fa161c74c 100644
--- a/src/Prism.Core/Prism.Core.csproj
+++ b/src/Prism.Core/Prism.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net47;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;net47;net6.0</TargetFrameworks>
     <AssemblyName>Prism</AssemblyName>
     <PackageId>Prism.Core</PackageId>
     <RootNamespace>Prism</RootNamespace>
@@ -14,6 +14,11 @@
     <Compile Update="Properties\Resources.Designer.cs" DesignTime="True" AutoGen="True" DependentUpon="Resources.resx" />
     <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
   </ItemGroup>
+
+  <ItemGroup Condition=" $(TargetFramework) == 'net461' ">
+    <PackageReference Include="System.ValueTuple" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Prism.Events\Prism.Events.csproj" />
   </ItemGroup>
diff --git a/src/Prism.Core/Properties/IsExternalInit.cs b/src/Prism.Core/Properties/IsExternalInit.cs
index 9a846fd09f..3f552b2f19 100644
--- a/src/Prism.Core/Properties/IsExternalInit.cs
+++ b/src/Prism.Core/Properties/IsExternalInit.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 
-#if NETSTANDARD || NET47
+#if NETSTANDARD || NET461_OR_GREATER
 namespace System.Runtime.CompilerServices;
 
 internal static class IsExternalInit
diff --git a/src/Prism.Events/Prism.Events.csproj b/src/Prism.Events/Prism.Events.csproj
index 1f79b157b9..5c4270a1f9 100644
--- a/src/Prism.Events/Prism.Events.csproj
+++ b/src/Prism.Events/Prism.Events.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net47;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;net47;net6.0</TargetFrameworks>
     <!-- Summary is not actually supported at this time. Including the summary for future support. -->
     <!--<Summary>Prism provides an implementation of a collection of design patterns that are helpful in writing well structured and maintainable applications.</Summary>-->
     <Description>Prism.Events is a library that facilitates communication between loosely coupled components in an application. It provides an event aggregator service that allows publishers and subscribers to interact through events without direct references. With multicast publish/subscribe functionality, multiple publishers can raise the same event, and multiple subscribers can listen to it, enabling flexible and efficient communication.</Description>
diff --git a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
index 3c849fb6f0..f259a72ab3 100644
--- a/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
+++ b/src/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net47;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <RootNamespace>Prism.DryIoc</RootNamespace>
     <PackageId>Prism.DryIoc</PackageId>
diff --git a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
index 4464633d2c..558166be04 100644
--- a/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
+++ b/src/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net47;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <RootNamespace>Prism.Unity</RootNamespace>
     <PackageId>Prism.Unity</PackageId>
diff --git a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj
index 991bf35338..912f9a616b 100644
--- a/src/Wpf/Prism.Wpf/Prism.Wpf.csproj
+++ b/src/Wpf/Prism.Wpf/Prism.Wpf.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Prism</RootNamespace>
-    <TargetFrameworks>net47;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net47;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <!--<Summary>Prism libraries related to user interface composition, regions, and modularity for WPF.</Summary>-->
     <Description>Prism is a fully open source version of the Prism guidance originally produced by Microsoft Patterns &amp; Practices. Prism provides an implementation of a collection of design patterns that are helpful in writing well structured, maintainable, and testable XAML applications, including MVVM, dependency injection, commanding, event aggregation, and more. Prism's core functionality is a shared library targeting the .NET Framework and .NET Standard. Features that need to be platform specific are implemented in the respective libraries for the target platform (WPF, Uno Platform, and Xamarin Forms).