v1.7.0

marko98y432ghiwf98y93w4f098 · Jan 23, 2023 · ab7ac7e · ab7ac7e
1 parent 04dfb3d
commit ab7ac7e
Show file tree

Hide file tree

Showing 39 changed files with 2,878 additions and 1,249 deletions.
diff --git a/source/2022/2022.csproj b/source/2022/2022.csproj
@@ -21,6 +21,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\shared\other\package\resource\icon.ico</ApplicationIcon>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -94,21 +95,21 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.SDK">
-      <Version>17.2.32505.173</Version>
+      <Version>17.4.33103.184</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.VCProjectEngine">
-      <Version>17.2.32505.173</Version>
+      <Version>17.4.33103.184</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.2.2186</Version>
+      <Version>17.4.2119</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
+  <Import Project="..\shared\project\shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/source/2022/other/package/source.extension.vsixmanifest b/source/2022/other/package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2e" Version="1.6.3" Language="en-US" Publisher="Stephane Molina" />
+        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2e" Version="1.7.0" Language="en-US" Publisher="Stephane Molina" />
         <DisplayName>Generate C++ Filters</DisplayName>
         <Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
         <License>other\package\resource\packageLicense.txt</License>

diff --git a/source/other/2015/2015.csproj b/source/other/2015/2015.csproj
@@ -21,6 +21,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\..\shared\other\package\resource\icon.ico</ApplicationIcon>
+	<LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -103,7 +104,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
+  <Import Project="..\..\shared\project\shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/source/other/2015/other/package/source.extension.vsixmanifest b/source/other/2015/other/package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a31" Version="1.6.3" Language="en-US" Publisher="Stephane Molina" />
+        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a31" Version="1.7.0" Language="en-US" Publisher="Stephane Molina" />
         <DisplayName>Generate C++ Filters</DisplayName>
         <Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
         <License>other\package\resource\packageLicense.txt</License>

diff --git a/source/other/2017/2017.csproj b/source/other/2017/2017.csproj
@@ -21,6 +21,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\..\shared\other\package\resource\icon.ico</ApplicationIcon>
+	<LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -123,7 +124,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
+  <Import Project="..\..\shared\project\shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/source/other/2017/other/package/source.extension.vsixmanifest b/source/other/2017/other/package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a30" Version="1.6.3" Language="en-US" Publisher="Stephane Molina" />
+        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a30" Version="1.7.0" Language="en-US" Publisher="Stephane Molina" />
         <DisplayName>Generate C++ Filters</DisplayName>
         <Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
         <License>other\package\resource\packageLicense.txt</License>

diff --git a/source/other/2019/2019.csproj b/source/other/2019/2019.csproj
@@ -21,6 +21,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>..\..\shared\other\package\resource\icon.ico</ApplicationIcon>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -98,15 +99,15 @@
       <Version>16.10.31320.204</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VSSDK.BuildTools">
-      <Version>17.2.2090-preview2</Version>
+      <Version>17.4.2119</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="..\..\shared\project\cppFiltersAutoShared.projitems" Label="Shared" />
+  <Import Project="..\..\shared\project\shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/source/other/2019/other/package/source.extension.vsixmanifest b/source/other/2019/other/package/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2f" Version="1.6.3" Language="en-US" Publisher="Stephane Molina" />
+        <Identity Id="VisualStudioCppExtensions.Company.5fdbeaec-89c7-4773-997c-f46757c67a2f" Version="1.7.0" Language="en-US" Publisher="Stephane Molina" />
         <DisplayName>Generate C++ Filters</DisplayName>
         <Description xml:space="preserve">Simple Extension which provide the ability to generate C++ project filters to replicate the folder hierarchy of underlying sources</Description>
         <License>other\package\resource\packageLicense.txt</License>

diff --git a/...ed/project/cppFiltersAutoShared.projitems → source/shared/project/shared.projitems b/...ed/project/cppFiltersAutoShared.projitems → source/shared/project/shared.projitems
@@ -6,23 +6,8 @@
     <SharedGUID>e85de64f-d3dc-4d22-89b7-cda7311e1335</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>cppFiltersAutoShared</Import_RootNamespace>
+    <Import_RootNamespace>temp</Import_RootNamespace>
   </PropertyGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)resource\resource.resx" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\advanced.resx">
-      <DependentUpon>advanced.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\error.resx">
-      <DependentUpon>error.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\question.resx">
-      <DependentUpon>question.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\questionFtd.resx">
-      <DependentUpon>questionFtd.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)source\gui\advanced.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\gui\advanced.Designer.cs">
@@ -52,10 +37,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)source\other\test\vc\projectReference.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\other\unused\project.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\other\unused\xml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)source\other\using.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)source\source\main\main.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\main\main2.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\utility\extension.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)source\source\utility\path.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\utility\project.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\work\dirToFilter\data.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\work\dirToFilter\utility\filters.cs" />
@@ -70,6 +57,21 @@
     <Compile Include="$(MSBuildThisFileDirectory)source\source\work\shared\filter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)source\source\work\shared\project.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)resource\resource.resx" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\advanced.resx">
+      <DependentUpon>advanced.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\error.resx">
+      <DependentUpon>error.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\question.resx">
+      <DependentUpon>question.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)source\gui\questionFtd.resx">
+      <DependentUpon>questionFtd.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Content Include="$(MSBuildThisFileDirectory)resource\package.ico" />
   </ItemGroup>

diff --git a/source/shared/project/shared.shproj b/source/shared/project/shared.shproj
@@ -5,9 +5,8 @@
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="cppFiltersAutoShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
+  <Import Project="shared.projitems" Label="Shared" />
+</Project>