From 871ab0359803bdfa0a122b1669704d77272eb1c5 Mon Sep 17 00:00:00 2001 From: InsanityCode <56584762+InsanityCode@users.noreply.github.com> Date: Thu, 9 May 2024 17:58:37 +0200 Subject: [PATCH 1/3] checkout support-dotnet-sdk on submodules --- submodules/ChaosPresets.References | 2 +- submodules/ChaosPresets.Targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/ChaosPresets.References b/submodules/ChaosPresets.References index b35db0d..43984be 160000 --- a/submodules/ChaosPresets.References +++ b/submodules/ChaosPresets.References @@ -1 +1 @@ -Subproject commit b35db0dbdd076b04bcc3fd21c888c4ee804b467e +Subproject commit 43984bef8da602dd6bdc9f5927aa620371e2231e diff --git a/submodules/ChaosPresets.Targets b/submodules/ChaosPresets.Targets index d391f3b..e126378 160000 --- a/submodules/ChaosPresets.Targets +++ b/submodules/ChaosPresets.Targets @@ -1 +1 @@ -Subproject commit d391f3b4342f83f45ba8597bfe4b04c4b826bd9c +Subproject commit e12637815e72bed39bd700eb1f987cb27219b658 From 811f5a3d8875622872eb94d10a92ad444c765c03 Mon Sep 17 00:00:00 2001 From: InsanityCode <56584762+InsanityCode@users.noreply.github.com> Date: Fri, 10 May 2024 15:28:09 +0200 Subject: [PATCH 2/3] provide dotnet sdk style csproj --- ChaosBuild.ProjectAnalyzer.SDK.csproj | 20 +++++++++++ ChaosBuild.ProjectAnalyzer.VS.csproj | 36 +++++++++++++++++++ ChaosBuild.ProjectAnalyzer.csproj | 52 --------------------------- ChaosBuild.ProjectAnalyzer.props | 30 ++++++++++++++++ Directory.Build.props | 5 +++ 5 files changed, 91 insertions(+), 52 deletions(-) create mode 100644 ChaosBuild.ProjectAnalyzer.SDK.csproj create mode 100644 ChaosBuild.ProjectAnalyzer.VS.csproj delete mode 100644 ChaosBuild.ProjectAnalyzer.csproj create mode 100644 ChaosBuild.ProjectAnalyzer.props create mode 100644 Directory.Build.props diff --git a/ChaosBuild.ProjectAnalyzer.SDK.csproj b/ChaosBuild.ProjectAnalyzer.SDK.csproj new file mode 100644 index 0000000..2ea1f64 --- /dev/null +++ b/ChaosBuild.ProjectAnalyzer.SDK.csproj @@ -0,0 +1,20 @@ + + + + + SDK + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ChaosBuild.ProjectAnalyzer.VS.csproj b/ChaosBuild.ProjectAnalyzer.VS.csproj new file mode 100644 index 0000000..fd489c6 --- /dev/null +++ b/ChaosBuild.ProjectAnalyzer.VS.csproj @@ -0,0 +1,36 @@ + + + + + + VS + + + + + + + + + + + + + + + + $(SolutionDir)\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll + True + + + $(SolutionDir)\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll + True + + + + + + \ No newline at end of file diff --git a/ChaosBuild.ProjectAnalyzer.csproj b/ChaosBuild.ProjectAnalyzer.csproj deleted file mode 100644 index cc6b566..0000000 --- a/ChaosBuild.ProjectAnalyzer.csproj +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - ChaosBuild.ProjectAnalyzer - ChaosBuild.ProjectAnalyzer - {5071A341-46B3-45DD-807E-A6F58053B870} - - - - - - - $(ProjectDir)$(OutputPath)$(AssemblyName).xml - - - - - - - - - - - - $(SolutionDir)\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll - True - - - $(SolutionDir)\packages\Microsoft.Build.Utilities.Core.14.3.0\lib\net45\Microsoft.Build.Utilities.Core.dll - True - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ChaosBuild.ProjectAnalyzer.props b/ChaosBuild.ProjectAnalyzer.props new file mode 100644 index 0000000..6228b44 --- /dev/null +++ b/ChaosBuild.ProjectAnalyzer.props @@ -0,0 +1,30 @@ + + + + + + ChaosBuild.ProjectAnalyzer + ChaosBuild.ProjectAnalyzer + {5071A341-46B3-45DD-807E-A6F58053B870} + + + + + + + + + + + + + + + + + + net4.5 + + + + \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..8e8d465 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From f06a0312ae280366971bedc8eb0c757a1aa4e357 Mon Sep 17 00:00:00 2001 From: InsanityCode <56584762+InsanityCode@users.noreply.github.com> Date: Sun, 2 Jun 2024 17:23:10 +0200 Subject: [PATCH 3/3] make SDK style target .NET Standard 2.0 Co-Authored-By: Frame <1663221+FramePerfection@users.noreply.github.com> --- ChaosBuild.ProjectAnalyzer.SDK.csproj | 5 +++-- ChaosBuild.ProjectAnalyzer.VS.csproj | 5 ++++- ChaosBuild.ProjectAnalyzer.props | 6 ------ Directory.Build.props | 2 +- submodules/ChaosPresets.References | 2 +- submodules/ChaosPresets.Targets | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChaosBuild.ProjectAnalyzer.SDK.csproj b/ChaosBuild.ProjectAnalyzer.SDK.csproj index 2ea1f64..45d2921 100644 --- a/ChaosBuild.ProjectAnalyzer.SDK.csproj +++ b/ChaosBuild.ProjectAnalyzer.SDK.csproj @@ -3,6 +3,7 @@ SDK + netstandard2.0 @@ -13,8 +14,8 @@ - - + + \ No newline at end of file diff --git a/ChaosBuild.ProjectAnalyzer.VS.csproj b/ChaosBuild.ProjectAnalyzer.VS.csproj index fd489c6..44b79f8 100644 --- a/ChaosBuild.ProjectAnalyzer.VS.csproj +++ b/ChaosBuild.ProjectAnalyzer.VS.csproj @@ -7,9 +7,11 @@ VS + net4.5 - + + @@ -21,6 +23,7 @@ + $(SolutionDir)\packages\Microsoft.Build.Framework.14.3.0\lib\net45\Microsoft.Build.Framework.dll True diff --git a/ChaosBuild.ProjectAnalyzer.props b/ChaosBuild.ProjectAnalyzer.props index 6228b44..c5562b6 100644 --- a/ChaosBuild.ProjectAnalyzer.props +++ b/ChaosBuild.ProjectAnalyzer.props @@ -17,14 +17,8 @@ - - - - - net4.5 - \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props index 8e8d465..05bcf02 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/submodules/ChaosPresets.References b/submodules/ChaosPresets.References index 43984be..bcdb018 160000 --- a/submodules/ChaosPresets.References +++ b/submodules/ChaosPresets.References @@ -1 +1 @@ -Subproject commit 43984bef8da602dd6bdc9f5927aa620371e2231e +Subproject commit bcdb018b603a2793ded2ffacca92a04328a3942f diff --git a/submodules/ChaosPresets.Targets b/submodules/ChaosPresets.Targets index e126378..7da9c1f 160000 --- a/submodules/ChaosPresets.Targets +++ b/submodules/ChaosPresets.Targets @@ -1 +1 @@ -Subproject commit e12637815e72bed39bd700eb1f987cb27219b658 +Subproject commit 7da9c1f6e4382970e6760dd26fd65570697df0ec