From 13b2ee53b2a1bbbd5402fe8e26cae93b088018c8 Mon Sep 17 00:00:00 2001 From: Daniel Triendl Date: Tue, 17 Aug 2021 09:42:20 +0200 Subject: [PATCH] Visual Studio 2022 Support --- .../BuildEventsPackage.cs | 0 .../BuildEventsPackage.resx | 0 .../CPABuildEventShared.projitems | 23 ++++++ .../CPABuildEventShared.shproj | 13 +++ .../Resources/BuildEventsPackage.ico | Bin .../RunPSScript.cs | 5 -- CPABuildEvents.sln | 29 ++++++- .../CPABuildEvents16.csproj | 18 +---- .../Properties/AssemblyInfo.cs | 4 +- .../source.extension.vsixmanifest | 0 CPABuildEvents17/CPABuildEvents17.csproj | 75 ++++++++++++++++++ CPABuildEvents17/Properties/AssemblyInfo.cs | 33 ++++++++ .../source.extension.vsixmanifest | 22 +++++ 13 files changed, 198 insertions(+), 24 deletions(-) rename {CPABuildEvents => CPABuildEventShared}/BuildEventsPackage.cs (100%) rename {CPABuildEvents => CPABuildEventShared}/BuildEventsPackage.resx (100%) create mode 100644 CPABuildEventShared/CPABuildEventShared.projitems create mode 100644 CPABuildEventShared/CPABuildEventShared.shproj rename {CPABuildEvents => CPABuildEventShared}/Resources/BuildEventsPackage.ico (100%) rename {CPABuildEvents => CPABuildEventShared}/RunPSScript.cs (90%) rename CPABuildEvents/CPABuildEvents.csproj => CPABuildEvents16/CPABuildEvents16.csproj (88%) rename {CPABuildEvents => CPABuildEvents16}/Properties/AssemblyInfo.cs (90%) rename {CPABuildEvents => CPABuildEvents16}/source.extension.vsixmanifest (100%) create mode 100644 CPABuildEvents17/CPABuildEvents17.csproj create mode 100644 CPABuildEvents17/Properties/AssemblyInfo.cs create mode 100644 CPABuildEvents17/source.extension.vsixmanifest diff --git a/CPABuildEvents/BuildEventsPackage.cs b/CPABuildEventShared/BuildEventsPackage.cs similarity index 100% rename from CPABuildEvents/BuildEventsPackage.cs rename to CPABuildEventShared/BuildEventsPackage.cs diff --git a/CPABuildEvents/BuildEventsPackage.resx b/CPABuildEventShared/BuildEventsPackage.resx similarity index 100% rename from CPABuildEvents/BuildEventsPackage.resx rename to CPABuildEventShared/BuildEventsPackage.resx diff --git a/CPABuildEventShared/CPABuildEventShared.projitems b/CPABuildEventShared/CPABuildEventShared.projitems new file mode 100644 index 0000000..8d329d2 --- /dev/null +++ b/CPABuildEventShared/CPABuildEventShared.projitems @@ -0,0 +1,23 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 4e4604cd-7346-4031-9d37-c01657f45e77 + + + CPABuildEventShared + + + + Designer + + + + + + + + + + \ No newline at end of file diff --git a/CPABuildEventShared/CPABuildEventShared.shproj b/CPABuildEventShared/CPABuildEventShared.shproj new file mode 100644 index 0000000..b4ddeb7 --- /dev/null +++ b/CPABuildEventShared/CPABuildEventShared.shproj @@ -0,0 +1,13 @@ + + + + 4e4604cd-7346-4031-9d37-c01657f45e77 + 14.0 + + + + + + + + diff --git a/CPABuildEvents/Resources/BuildEventsPackage.ico b/CPABuildEventShared/Resources/BuildEventsPackage.ico similarity index 100% rename from CPABuildEvents/Resources/BuildEventsPackage.ico rename to CPABuildEventShared/Resources/BuildEventsPackage.ico diff --git a/CPABuildEvents/RunPSScript.cs b/CPABuildEventShared/RunPSScript.cs similarity index 90% rename from CPABuildEvents/RunPSScript.cs rename to CPABuildEventShared/RunPSScript.cs index 5c844b8..41fe379 100644 --- a/CPABuildEvents/RunPSScript.cs +++ b/CPABuildEventShared/RunPSScript.cs @@ -1,13 +1,8 @@ using Microsoft.VisualStudio.Shell; using Microsoft.VisualStudio.Shell.Interop; -using Microsoft.VisualStudio.Threading; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.IO; -using System.Linq; using System.Management.Automation; -using System.Text; using Task = System.Threading.Tasks.Task; namespace CPABuildEvents diff --git a/CPABuildEvents.sln b/CPABuildEvents.sln index 739f383..77ba846 100644 --- a/CPABuildEvents.sln +++ b/CPABuildEvents.sln @@ -1,20 +1,43 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.28803.352 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31606.5 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents", "CPABuildEvents\CPABuildEvents.csproj", "{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CPABuildEventShared", "CPABuildEventShared\CPABuildEventShared.shproj", "{4E4604CD-7346-4031-9D37-C01657F45E77}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents16", "CPABuildEvents16\CPABuildEvents16.csproj", "{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents17", "CPABuildEvents17\CPABuildEvents17.csproj", "{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + CPABuildEventShared\CPABuildEventShared.projitems*{2edfee33-2bad-49d3-87ac-c59c42a099d0}*SharedItemsImports = 4 + CPABuildEventShared\CPABuildEventShared.projitems*{4e4604cd-7346-4031-9d37-c01657f45e77}*SharedItemsImports = 13 + CPABuildEventShared\CPABuildEventShared.projitems*{6ff2a85f-b5eb-4e8b-8a47-dce44336ee14}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|x86.ActiveCfg = Debug|x86 + {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|x86.Build.0 = Debug|x86 {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|Any CPU.ActiveCfg = Release|Any CPU {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|Any CPU.Build.0 = Release|Any CPU + {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|x86.ActiveCfg = Release|x86 + {2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|x86.Build.0 = Release|x86 + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|x86.ActiveCfg = Debug|x86 + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|x86.Build.0 = Debug|x86 + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|Any CPU.Build.0 = Release|Any CPU + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|x86.ActiveCfg = Release|x86 + {6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CPABuildEvents/CPABuildEvents.csproj b/CPABuildEvents16/CPABuildEvents16.csproj similarity index 88% rename from CPABuildEvents/CPABuildEvents.csproj rename to CPABuildEvents16/CPABuildEvents16.csproj index 68edadc..59119f3 100644 --- a/CPABuildEvents/CPABuildEvents.csproj +++ b/CPABuildEvents16/CPABuildEvents16.csproj @@ -53,8 +53,6 @@ - - @@ -78,24 +76,16 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - true - VSPackage - Designer - - + + + \ No newline at end of file diff --git a/CPABuildEvents17/Properties/AssemblyInfo.cs b/CPABuildEvents17/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..8b732c8 --- /dev/null +++ b/CPABuildEvents17/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("CPABuildEvents17")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CPABuildEvents17")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/CPABuildEvents17/source.extension.vsixmanifest b/CPABuildEvents17/source.extension.vsixmanifest new file mode 100644 index 0000000..0d7b666 --- /dev/null +++ b/CPABuildEvents17/source.extension.vsixmanifest @@ -0,0 +1,22 @@ + + + + + CPABuildEvents17 + Empty VSIX Project. + + + + amd64 + + + + + + + + + + + +