From 90bfc5b07c10d0c5f30723c5a473cf094acb5cb5 Mon Sep 17 00:00:00 2001
From: Bela VanderVoort <twobitbela@gmail.com>
Date: Wed, 15 Nov 2023 20:27:00 -0800
Subject: [PATCH] Testing new action for msbuild (#1017)

* update doc

* get those two passing

* it seems that this is needed
---
 Src/CSharpier.MsBuild/README.md                    | 14 ++++----------
 .../build/CSharpier.MsBuild.targets                |  2 +-
 Tests/CSharpier.MsBuild.Test/net48/net48.csproj    |  1 +
 Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj  |  1 +
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Src/CSharpier.MsBuild/README.md b/Src/CSharpier.MsBuild/README.md
index 8c9de1d91..8b0903a35 100644
--- a/Src/CSharpier.MsBuild/README.md
+++ b/Src/CSharpier.MsBuild/README.md
@@ -4,13 +4,7 @@ One way to test the changes in the build/* files
 - Edit those files at `C:\Users\[Username]\.nuget\packages\csharpier.msbuild\[VersionNumber]\build`
 - Ensure you revert those files and make the same changes to the files here.
 
-Another way to test
-
-- Making any changes you want
-```powershell
-Import-Module (RepoRoot)/Shell/Init.ps1
-CSH-BuildPackages
-```
-- change the version in CSharpier.MSBuild.Test.csproj (until we update to 0.25.0 or higher), then it can be $(Version)
-- Running this from the root `docker build . -f ./Src/CSharpier.MsBuild.Test/Dockerfile`
-
+Another way
+- the validate PR GH action does this, currently only uses the net8 sdk
+- dotnet pack Src/CSharpier.MsBuild/CSharpier.MsBuild.csproj -o nupkg /p:Version=0.0.1
+- docker build -f ./Tests/CSharpier.MsBuild.Test/Dockerfile .
diff --git a/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets b/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets
index edf51723a..7ae2d4133 100644
--- a/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets
+++ b/Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets
@@ -26,7 +26,7 @@
   <!-- getting this to run a single time for projects that target multiple frameworks requires all of this
    see https://github.com/dotnet/msbuild/issues/2781 -->
   <Target Name="CSharpierFormat" BeforeTargets="DispatchToInnerBuilds;BeforeBuild">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="CSharpierFormatInner" Properties="TargetFramework=$(FirstTargetFramework)" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="CSharpierFormatInner" Properties="TargetFramework=$(FirstTargetFramework);CSharpier_FrameworkVersion=$(CSharpier_FrameworkVersion)" />
   </Target>
 
   <Target Name="CSharpierLogBypass" BeforeTargets="CSharpierFormatInner" Condition="'$(CSharpier_Bypass)' == 'true'">
diff --git a/Tests/CSharpier.MsBuild.Test/net48/net48.csproj b/Tests/CSharpier.MsBuild.Test/net48/net48.csproj
index 09fec49d8..2567b4dc6 100644
--- a/Tests/CSharpier.MsBuild.Test/net48/net48.csproj
+++ b/Tests/CSharpier.MsBuild.Test/net48/net48.csproj
@@ -4,6 +4,7 @@
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
     <OutputType>library</OutputType>
     <TargetFramework>net48</TargetFramework>
+    <CSharpier_FrameworkVersion>net8.0</CSharpier_FrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj b/Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj
index 0704b982f..170364e7b 100644
--- a/Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj
+++ b/Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj
@@ -4,6 +4,7 @@
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
     <OutputType>library</OutputType>
     <TargetFramework>net7.0</TargetFramework>
+    <CSharpier_FrameworkVersion>net8.0</CSharpier_FrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>