Sync to CN 7.01

.editorconfig

@@ -143,6 +143,14 @@ csharp_preserve_single_line_statements = true
 
 end_of_line=lf
 
+[*.jsonc]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
 #Don't check library files or autogenerated files
 [{OverlayPlugin.Common/TinyIoC.cs,**/*.Designer.cs}]
 generated_code = true

.github/workflows/build-artifact.yml

@@ -11,8 +11,8 @@ on:
       - 'AddonExample/**'
       - 'HtmlRenderer/**'
       - 'Overlay*/**'
-      - 'tools/fetch_deps.py'
-      - 'DEPS.py'
+      - 'tools/fetch_deps.ps1'
+      - 'DEPS.json'
       - 'OverlayPlugin.sln'
       - 'build.bat'
       - 'build.ps1'
@@ -25,6 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v1
 
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7'
+
       - name: Set artifact name
         shell: bash
         run: |
@@ -35,21 +39,18 @@ jobs:
         id: cache-dependencies
         uses: actions/cache@v2
         with:
-          path: ./Thirdparty
-          key: ${{ runner.os }}-overlayplugin-${{ hashFiles('./tools/fetch_deps.py', './DEPS.py') }}
+          path: |
+            ./Thirdparty
+            ./OverlayPlugin.Core/Thirdparty
+          key: ${{ runner.os }}-overlayplugin-${{ hashFiles('./tools/fetch_deps.ps1', './DEPS.json', './tools/StripFFXIVClientStructs/StripFFXIVClientStructs/StripFFXIVClientStructs.cs') }}
           restore-keys: |
             ${{ runner.os }}-overlayplugin-
       # Fetch dependencies only if cache-hit is false
-      - name: Set up Python 3.8
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
       - name: Fetch dependencies
         if: steps.cache-dependencies.outputs.cache-hit != 'true'
+        shell: pwsh
         run: |
-          python .\tools\fetch_deps.py
+          .\tools\fetch_deps.ps1
 
       - name: Set up msbuild
         uses: microsoft/[email protected]
@@ -65,14 +66,9 @@ jobs:
       - name: Determine Version
         shell: pwsh
         run: |
-          $text = [System.IO.File]::ReadAllText("OverlayPlugin\Properties\AssemblyInfo.cs");
-          $regex = [regex]::New('\[assembly: AssemblyVersion\("([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+"\)');
-          $m = $regex.Match($text);
-          if (-not $m) {
-              echo "Error: Version number not found in the AssemblyInfo.cs!"
-              exit 1
-          }
-          $version = $m.Groups[1]
+          [xml]$csprojcontents = Get-Content -Path "Directory.Build.props";
+          $version = $csprojcontents.Project.PropertyGroup.AssemblyVersion;
+          $version = ($version | Out-String).Trim()
           echo "version=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
       # Expected "OverlayPlugin" as top level item of .zip

.github/workflows/release.yml

@@ -5,13 +5,14 @@ on:
     branches:
       - main
     paths:
-      - '**/AssemblyInfo.cs'
+      - 'Directory.Build.props'
 
 jobs:
   validate_tag:
     runs-on: windows-latest
     outputs:
       version: ${{ steps.determine_version.outputs.version }}
+      do_release: ${{ steps.check_tag.outputs.do_release }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -21,64 +22,52 @@ jobs:
         id: determine_version
         shell: pwsh
         run: |
-          $text = [System.IO.File]::ReadAllText("OverlayPlugin\Properties\AssemblyInfo.cs");
-          $regex = [regex]::New('\[assembly: AssemblyVersion\("([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+"\)');
-          $m = $regex.Match($text);
-          if (-not $m) {
-              echo "Error: Version number not found in the AssemblyInfo.cs!"
-              exit 1
-          }
-          $version = $m.Groups[1]
-          echo "::set-output name=version::$version"
+          [xml]$csprojcontents = Get-Content -Path "Directory.Build.props";
+          $version = $csprojcontents.Project.PropertyGroup.AssemblyVersion;
+          $version = ($version | Out-String).Trim()
+          echo "version=$version" >> $env:GITHUB_OUTPUT
 
       - name: Check Tag Exists
+        id: check_tag
         shell: bash
         run: |
           if [ $(git tag -l "v${{ steps.determine_version.outputs.version }}") ]; then
-              echo "Error: Existing git tag found. Exiting..."
-              exit 1
+              echo "Existing git tag found. Exiting..."
+              echo "do_release=false" >> $GITHUB_OUTPUT
+          else
+              echo "Version bump detected - ${{ steps.determine_version.outputs.version }}"
+              echo "do_release=true" >> $GITHUB_OUTPUT
           fi
 
-  validate_version:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Validate AssemblyInfo Versions
-        run: |
-          python tools/validate_versions.py
-
   create_release:
-    needs: [validate_tag, validate_version]
+    needs: [validate_tag]
     runs-on: windows-latest
+    if: |
+      github.repository == 'OverlayPlugin/OverlayPlugin' &&
+      needs.validate_tag.outputs.do_release == 'true'
     steps:
       - uses: actions/checkout@v2
 
       - name: Check dependencies cache
         id: cache-dependencies
         uses: actions/cache@v2
         with:
-          path: ./Thirdparty
-          key: ${{ runner.os }}-overlayplugin-${{ hashFiles('./tools/fetch_deps.py', './DEPS.py') }}
+          path: |
+            ./Thirdparty
+            ./OverlayPlugin.Core/Thirdparty
+          key: ${{ runner.os }}-overlayplugin-${{ hashFiles('./tools/fetch_deps.ps1', './DEPS.json', './tools/StripFFXIVClientStructs/StripFFXIVClientStructs/StripFFXIVClientStructs.cs') }}
           restore-keys: |
             ${{ runner.os }}-overlayplugin-
-
       # Fetch dependencies only if cache-hit is false
-      - name: Set up Python 3.8
-        if: steps.cache-dependencies.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
       - name: Fetch dependencies
         if: steps.cache-dependencies.outputs.cache-hit != 'true'
+        shell: pwsh
         run: |
-          python .\tools\fetch_deps.py
+          .\tools\fetch_deps.ps1
+
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '7'
 
       - name: Set up msbuild
         uses: microsoft/[email protected]

AddonExample/AddonExample.csproj

@@ -1,120 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B9BBE478-8FD7-43D9-BD50-C806B1EC672F}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AddonExample</RootNamespace>
-    <AssemblyName>AddonExample</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\out\Debug\addons\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\out\Release\addons\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\OverlayPlugin\bin\x86\Debug\addons\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <AssemblyTitle>AddonExample</AssemblyTitle>
+    <Product>AddonExample</Product>
+    <Copyright>Copyright ©  2015</Copyright>
+    <OutputPath>..\out\$(Configuration)\addons\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Advanced Combat Tracker">
       <HintPath>..\Thirdparty\ACT\Advanced Combat Tracker.exe</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddonExampleEventSource.cs" />
-    <Compile Include="AddonExampleEventSourceConfig.cs" />
-    <Compile Include="AddonExampleEventSourceConfigPanel.cs">
+    <Compile Update="AddonExampleEventSourceConfigPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="AddonExampleEventSourceConfigPanel.Designer.cs">
+    <Compile Update="AddonExampleEventSourceConfigPanel.Designer.cs">
       <DependentUpon>AddonExampleEventSourceConfigPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="AddonExampleOverlay.cs" />
-    <Compile Include="AddonExampleOverlayConfig.cs" />
-    <Compile Include="AddonExampleOverlayConfigPanel.cs">
+    <Compile Update="AddonExampleOverlayConfigPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="AddonExampleOverlayConfigPanel.Designer.cs">
+    <Compile Update="AddonExampleOverlayConfigPanel.Designer.cs">
       <DependentUpon>AddonExampleOverlayConfigPanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="AddonExample.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OverlayPlugin.Common\OverlayPlugin.Common.csproj">
-      <Project>{423fcbfc-dd3b-415f-be29-7a4a46614b79}</Project>
-      <Name>OverlayPlugin.Common</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\OverlayPlugin.Core\OverlayPlugin.Core.csproj">
-      <Project>{dd6d2a9a-4ad4-47b8-a1d0-c8608ea37092}</Project>
-      <Name>OverlayPlugin.Core</Name>
-      <Private>False</Private>
-    </ProjectReference>
+    <ProjectReference Include="..\tools\VSBuildDeps\VSBuildDeps.csproj" Private="False" />
+    <ProjectReference Include="..\OverlayPlugin.Common\OverlayPlugin.Common.csproj" />
+    <ProjectReference Include="..\OverlayPlugin.Core\OverlayPlugin.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="AddonExampleEventSourceConfigPanel.resx">
+    <EmbeddedResource Update="AddonExampleEventSourceConfigPanel.resx">
       <DependentUpon>AddonExampleEventSourceConfigPanel.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="AddonExampleOverlayConfigPanel.resx">
+    <EmbeddedResource Update="AddonExampleOverlayConfigPanel.resx">
       <DependentUpon>AddonExampleOverlayConfigPanel.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

AddonExample/AddonExampleEventSource.cs

@@ -106,9 +106,14 @@ protected override void Update()
             }));
         }
 
-        public override void Dispose()
+        protected override void Dispose(bool disposing)
         {
-            base.Dispose();
+            if (disposing && originalTimer != null)
+            {
+                originalTimer.Dispose();
+                originalTimer = null;
+            }
+            base.Dispose(disposing);
         }
 
         // Sends an event called |event_name| to javascript, with an event.detail that contains