Upgrade to TypeScript 7

.github/workflows/integration-tests.yml

@@ -24,14 +24,6 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        node-version: '22'
-        cache: 'yarn'
-        cache-dependency-path: |
-          SQLSchemaCompare/yarn.lock
-          SQLSchemaCompare.UI/yarn.lock
     - name: Restore dependencies
       run: dotnet restore --locked-mode
     - name: Build
@@ -71,14 +63,6 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        node-version: '22'
-        cache: 'yarn'
-        cache-dependency-path: |
-          SQLSchemaCompare/yarn.lock
-          SQLSchemaCompare.UI/yarn.lock
     - name: Restore dependencies
       run: dotnet restore --locked-mode
     - name: Build
@@ -114,14 +98,6 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        node-version: '22'
-        cache: 'yarn'
-        cache-dependency-path: |
-          SQLSchemaCompare/yarn.lock
-          SQLSchemaCompare.UI/yarn.lock
     - name: Restore dependencies
       run: dotnet restore --locked-mode
     - name: Build
@@ -163,14 +139,6 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        node-version: '22'
-        cache: 'yarn'
-        cache-dependency-path: |
-          SQLSchemaCompare/yarn.lock
-          SQLSchemaCompare.UI/yarn.lock
     - name: Restore dependencies
       run: dotnet restore --locked-mode
     - name: Build

.github/workflows/release.yml

@@ -19,6 +19,9 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
+    - run: |
+        npm install -g corepack --force
+        corepack enable
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
@@ -27,7 +30,13 @@ jobs:
         cache-dependency-path: |
           SQLSchemaCompare/yarn.lock
           SQLSchemaCompare.UI/yarn.lock
-    - name: Restore dependencies
+    - name: Restore npm dependencies (SQLSchemaCompare)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare
+    - name: Restore npm dependencies (SQLSchemaCompare.UI)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare.UI
+    - name: Restore .NET dependencies
       run: dotnet restore --locked-mode
 
     - name: Build win-x64
@@ -86,6 +95,9 @@ jobs:
         shell: bash
     steps:
     - uses: actions/checkout@v6
+    - run: |
+        npm install -g corepack --force
+        corepack enable
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
@@ -94,6 +106,9 @@ jobs:
         cache-dependency-path: |
           SQLSchemaCompare/yarn.lock
           SQLSchemaCompare.UI/yarn.lock
+    - name: Restore npm dependencies (SQLSchemaCompare)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare
     - name: Download publish-win artifact
       uses: actions/download-artifact@v8
       with:
@@ -127,6 +142,9 @@ jobs:
         shell: bash
     steps:
     - uses: actions/checkout@v6
+    - run: |
+        npm install -g corepack --force
+        corepack enable
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
@@ -135,6 +153,9 @@ jobs:
         cache-dependency-path: |
           SQLSchemaCompare/yarn.lock
           SQLSchemaCompare.UI/yarn.lock
+    - name: Restore npm dependencies (SQLSchemaCompare)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare
     - name: Download publish-linux artifact
       uses: actions/download-artifact@v8
       with:
@@ -178,6 +199,9 @@ jobs:
         shell: bash
     steps:
     - uses: actions/checkout@v6
+    - run: |
+        npm install -g corepack --force
+        corepack enable
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
@@ -186,6 +210,9 @@ jobs:
         cache-dependency-path: |
           SQLSchemaCompare/yarn.lock
           SQLSchemaCompare.UI/yarn.lock
+    - name: Restore npm dependencies (SQLSchemaCompare)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare
     - name: Download publish-osx-${{ matrix.arch }} artifact
       uses: actions/download-artifact@v8
       with:

.github/workflows/unit-tests.yml

@@ -22,6 +22,9 @@ jobs:
       uses: actions/setup-dotnet@v5
       with:
         dotnet-version: '10.0.3xx'
+    - run: |
+        npm install -g corepack --force
+        corepack enable
     - name: Setup Node.js
       uses: actions/setup-node@v6
       with:
@@ -30,7 +33,13 @@ jobs:
         cache-dependency-path: |
           SQLSchemaCompare/yarn.lock
           SQLSchemaCompare.UI/yarn.lock
-    - name: Restore dependencies
+    - name: Restore npm dependencies (SQLSchemaCompare)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare
+    - name: Restore npm dependencies (SQLSchemaCompare.UI)
+      run: yarn install --immutable
+      working-directory: SQLSchemaCompare.UI
+    - name: Restore .NET dependencies
       run: dotnet restore --locked-mode
     - name: Build
       run: dotnet build --no-restore -c Release

.gitignore

@@ -402,6 +402,15 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
+# Yarn
+**/.pnp.*
+**/.yarn/*
+**/!.yarn/patches
+**/!.yarn/plugins
+**/!.yarn/releases
+**/!.yarn/sdks
+**/!.yarn/versions
+
 ################################################################################
 ## Content of the Visual Studio .gitignore from GitHub goes above this line.  ##
 ## https://github.com/github/gitignore/blob/main/VisualStudio.gitignore       ##

BaseTsConfig.json

@@ -1,6 +1,7 @@
 {
   "compileOnSave": true,
   "compilerOptions": {
+    "target": "ES2022",
     "checkJs": false,
     "allowJs": false,
     "noEmitOnError": true,

CreateInstallerCommon.bat

@@ -34,7 +34,7 @@ echo      ^|  _______________________^|_
 echo       \_/_________________________/
 echo.
 
-dotnet restore -r %targetdotnet%
+dotnet restore --locked-mode
 if ERRORLEVEL 1 exit /b %ERRORLEVEL%
 
 dotnet build --no-restore SQLSchemaCompare.UI -r %targetdotnet% -c %configuration%

Directory.Build.props

@@ -5,7 +5,7 @@
     <Product>SQL Schema Compare</Product>
     <Description>https://github.com/TiCodeX/SQLSchemaCompare</Description>
     <Authors>TiCodeX</Authors>
-    <Version>2026.6.1</Version>
+    <Version>2026.7.1</Version>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <ImplicitUsings>enable</ImplicitUsings>

SQLSchemaCompare.CLI/packages.lock.json

@@ -442,14 +442,14 @@
           "Microsoft.EntityFrameworkCore.SqlServer": "[10.0.10, )",
           "Microting.EntityFrameworkCore.MySql": "[10.0.10, )",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, )",
-          "TiCodeX.SQLSchemaCompare.Services": "[2026.6.1, )"
+          "TiCodeX.SQLSchemaCompare.Services": "[2026.7.1, )"
         }
       },
       "TiCodeX.SQLSchemaCompare.Services": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[10.0.10, )",
-          "TiCodeX.SQLSchemaCompare.Core": "[2026.6.1, )"
+          "TiCodeX.SQLSchemaCompare.Core": "[2026.7.1, )"
         }
       }
     },

SQLSchemaCompare.Infrastructure/packages.lock.json

@@ -352,7 +352,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[10.0.10, )",
-          "TiCodeX.SQLSchemaCompare.Core": "[2026.6.1, )"
+          "TiCodeX.SQLSchemaCompare.Core": "[2026.7.1, )"
         }
       }
     },

SQLSchemaCompare.Test/packages.lock.json

@@ -622,14 +622,14 @@
           "Microsoft.EntityFrameworkCore.SqlServer": "[10.0.10, )",
           "Microting.EntityFrameworkCore.MySql": "[10.0.10, )",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, )",
-          "TiCodeX.SQLSchemaCompare.Services": "[2026.6.1, )"
+          "TiCodeX.SQLSchemaCompare.Services": "[2026.7.1, )"
         }
       },
       "TiCodeX.SQLSchemaCompare.Services": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[10.0.10, )",
-          "TiCodeX.SQLSchemaCompare.Core": "[2026.6.1, )"
+          "TiCodeX.SQLSchemaCompare.Core": "[2026.7.1, )"
         }
       }
     },

SQLSchemaCompare.UI/.yarnrc.yml

@@ -0,0 +1,8 @@
+approvedGitRepositories:
+  - "**"
+
+enableScripts: true
+
+nodeLinker: node-modules
+
+npmMinimalAgeGate: 0

SQLSchemaCompare.UI/SQLSchemaCompare.UI.csproj

@@ -2,11 +2,9 @@
   <PropertyGroup>
     <AssemblyName>TiCodeX.SQLSchemaCompare.UI</AssemblyName>
     <RootNamespace>TiCodeX.SQLSchemaCompare.UI</RootNamespace>
-    <TypeScriptToolsVersion>latest</TypeScriptToolsVersion>
     <OutputType>Exe</OutputType>
     <PublishDir>..\.publish</PublishDir>
     <SelfContained>true</SelfContained>
-    <CompileTypeScriptDependsOn>YarnLintBuild</CompileTypeScriptDependsOn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,15 +22,9 @@
     <Content Remove="dist\**" />
     <EmbeddedResource Remove="dist\**" />
     <None Remove="dist\**" />
-    <!--Copy wwwroot to output-->
+    <!--Copy wwwroot to output, except ts files-->
     <Content Update="wwwroot\**" CopyToOutputDirectory="Always" />
-    <!--Configure json files as None-->
-    <!--The tsconfig.json needs to be TypeScriptCompile so that it's used for the compilation -->
-    <Content Remove="tsconfig.json" />
-    <TypeScriptCompile Include="tsconfig.json" />
-    <!--Configure all TypeScript files to be compiled-->
-    <Content Remove="wwwroot\**\*.ts" />
-    <TypeScriptCompile Include="wwwroot\**\*.ts" />
+    <Content Update="wwwroot\**\*.ts" CopyToOutputDirectory="Never" PublishState="Exclude" />
     <!--Configure all Bootstrap scss files as None-->
     <Content Remove="wwwroot\lib\bootstrap\**\*.scss" />
     <None Include="wwwroot\lib\bootstrap\**\*.scss" />
@@ -43,10 +35,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.10" />
-    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="6.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Neolution.CodeAnalysis" Version="3.3.0-beta.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
@@ -59,8 +47,19 @@
     <ProjectReference Include="..\SQLSchemaCompare.Infrastructure\SQLSchemaCompare.Infrastructure.csproj" />
   </ItemGroup>
 
-  <Target Name="YarnLintBuild" BeforeTargets="Build">
-    <Exec Command="yarn build"></Exec>
+  <Target Name="YarnLintBuild" BeforeTargets="CurrentFilesForStaticWebAssets;BeforeBuild;BeforeRebuild">
+    <Exec Command="yarn build-vs"></Exec>
+    <ItemGroup>
+      <Content Include="wwwroot\**\*.js" Exclude="@(Content)">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+      <Content Include="wwwroot\**\*.js.gz" Exclude="@(Content)">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+      <Content Include="wwwroot\**\*.css" Exclude="@(Content)">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
+    </ItemGroup>
   </Target>
 
   <Target Name="RemovePublishFolder" BeforeTargets="PrepareForPublish">

SQLSchemaCompare.UI/package.json

@@ -2,25 +2,27 @@
   "name": "sqlschemacompare.ui",
   "version": "1.0.0",
   "license": "GPL-3.0-only",
+  "private": true,
   "scripts": {
-    "preclean": "yarn install --frozen-lockfile",
-    "clean": "shx rm -rf wwwroot/js/**/*.js*",
+    "clean": "shx rm -rf \"wwwroot/js/**/*.js*\"",
     "dprint-check": "yarn dprint check --list-different",
     "eslint": "eslint --cache",
     "prelint": "yarn clean",
-    "lint": "yarn eslint && yarn dprint-check",
+    "lint": "yarn prelint && yarn eslint && yarn dprint-check",
     "prelint-vs": "yarn prelint",
-    "lint-vs": "yarn eslint --quiet --format visualstudio && yarn dprint-check",
+    "lint-vs": "yarn prelint-vs && yarn eslint --quiet --format visualstudio && yarn dprint-check",
     "prebuild": "yarn lint",
-    "build": "yarn build-scss",
+    "build": "yarn prebuild && yarn build-scss && yarn build-ts",
     "prebuild-vs": "yarn lint-vs",
-    "build-vs": "yarn build-scss",
+    "build-vs": "yarn prebuild-vs && yarn build-scss && yarn build-ts",
+    "build-ts": "tsc --build",
     "build-scss": "sass --quiet --no-source-map wwwroot/css/Index.scss wwwroot/css/Index.css"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
     "@tsconfig/recommended": "^1.0.13",
     "@tsconfig/strictest": "^2.0.8",
+    "@typescript/native": "npm:typescript@^7.0.2",
     "dprint": "^0.55.2",
     "eslint": "^10.8.0",
     "eslint-formatter-visualstudio": "^9.0.1",
@@ -29,7 +31,8 @@
     "eslint-plugin-unicorn": "^72.0.0",
     "sass": "^1.102.0",
     "shx": "^0.4.0",
-    "typescript": "^6.0.3",
+    "typescript": "npm:@typescript/typescript6@^6.0.2",
     "typescript-eslint": "^8.65.0"
-  }
+  },
+  "packageManager": "yarn@4.17.1"
 }