From 890c69e6f9398d4afd79a200cef19561e34e6df2 Mon Sep 17 00:00:00 2001 From: "bela.vandervoort" Date: Wed, 15 Nov 2023 21:33:34 -0600 Subject: [PATCH 1/3] update doc --- Src/CSharpier.MsBuild/README.md | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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 . From e3f6e02438e12b21a082f4b17d4d9a736a10ccba Mon Sep 17 00:00:00 2001 From: "bela.vandervoort" Date: Wed, 15 Nov 2023 21:41:27 -0600 Subject: [PATCH 2/3] get those two passing --- Tests/CSharpier.MsBuild.Test/net48/net48.csproj | 1 + Tests/CSharpier.MsBuild.Test/net7.0/net7.0.csproj | 1 + 2 files changed, 2 insertions(+) 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 @@ false library net48 + net8.0 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 @@ false library net7.0 + net8.0 From 765a80fd6fd43e23d3297305b8008fcd2ddd3bf5 Mon Sep 17 00:00:00 2001 From: "bela.vandervoort" Date: Wed, 15 Nov 2023 22:24:49 -0600 Subject: [PATCH 3/3] it seems that this is needed --- Src/CSharpier.MsBuild/build/CSharpier.MsBuild.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - +