From 428dd405c8b32535048fcfb6ea598c69e9623474 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 16 Mar 2023 07:59:23 +0100
Subject: [PATCH] [src] Improve the generated project files a little bit.

* Use the right TFM.
* Compute the right assembly name.
---
 src/Makefile           | 1 +
 src/dotnet.tmpl.csproj | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 566dc682974f..cc43fcec58a8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1351,6 +1351,7 @@ define DotNetProjectFiles
 $(DOTNET_BUILD_DIR)/projects/$(1)/$(1).csproj: dotnet.tmpl.csproj Makefile $$(wildcard $(CURDIR)/*.sources)
 	@mkdir -p $$(dir $$@)
 	@sed \
+		-e 's*%DOTNET_TFM%*$(DOTNET_TFM)*' \
 		-e 's*%PLATFORM%*$(1)*' \
 		-e 's*<!--%FILES%-->*$$(foreach file,$$($(2)_DOTNET_SOURCES),<Compile Include="../../../../$$(file)" Link="sources/$$(file)" />)*' \
 		-e 's*<!--%APIS%-->*$$(foreach file,$$($(2)_DOTNET_APIS),<None Include="../../../../$$(file)" Link="apis/$$(file)" />)*' \
diff --git a/src/dotnet.tmpl.csproj b/src/dotnet.tmpl.csproj
index b4c63330b1b5..d72b0bc5f096 100644
--- a/src/dotnet.tmpl.csproj
+++ b/src/dotnet.tmpl.csproj
@@ -3,10 +3,10 @@
   <!-- This is a project file to load in the IDE to get code completion, etc. It's not used for building the product assemblies, that happens in the makefile -->
   <PropertyGroup>
     <_TargetPlatform>%PLATFORM%</_TargetPlatform>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>%DOTNET_TFM%</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> <!-- this line shouldn't be necessary, but VSMac on one of my machines won't load the project otherwise -->
     <OutputType>Library</OutputType>
-    <AssemblyName>Xamarin.iOS</AssemblyName>
+    <AssemblyName>Microsoft.%PLATFORM%</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\..\..\..\product.snk</AssemblyOriginatorKeyFile>
     <LangVersion>latest</LangVersion>