small fixes

Author: denis-peshkov

.github/workflows/dotnet.yml

@@ -85,6 +85,14 @@ jobs:
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
+      - name: Set NuGet package version
+        run: |
+          $nugetVersion = "${{ env.semVer }}"
+          if ([string]::IsNullOrWhiteSpace($nugetVersion)) { $nugetVersion = "2.2.0" }
+          (Get-Content "src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.csproj") -replace '<PackageVersion>[^<]+</PackageVersion>', "<PackageVersion>$nugetVersion</PackageVersion>" | Set-Content "src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.csproj"
+          (Get-Content "src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.props") -replace 'Version="[^"]+"', "Version=`"$nugetVersion`"" | Set-Content "src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.props"
+          echo "NUGET_VERSION=$nugetVersion" >> $env:GITHUB_ENV
+
       - name: Increment VSIX version
         if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
         run: |
@@ -111,6 +119,22 @@ jobs:
       - name: Build Rider plugin
         run: bash build-rider-plugin.sh $env:BUILD_CONFIG "${{ env.semVer }}"
 
+      - name: Pack NuGet packages
+        run: |
+          New-Item -ItemType Directory -Path artifacts/nuget -Force
+          dotnet pack src/TypeScriptDefinitionGenerator.Cli/TypeScriptDefinitionGenerator.Cli.csproj -c $env:BUILD_CONFIG -o artifacts/nuget -p:PackageVersion=$env:NUGET_VERSION
+          dotnet pack src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.csproj -c $env:BUILD_CONFIG -o artifacts/nuget -p:PackageVersion=$env:NUGET_VERSION
+
+      - name: Publish to NuGet.org
+        if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
+        run: |
+          $pkgs = Get-ChildItem -Path artifacts/nuget -Filter "*.nupkg" -ErrorAction SilentlyContinue
+          foreach ($pkg in $pkgs) {
+            dotnet nuget push $pkg.FullName --source https://api.nuget.org/v3/index.json --api-key $env:NUGET_API_KEY --skip-duplicate
+          }
+        env:
+          NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
+
       - name: ref
         run: echo "github.head_ref 1 ${{ github.head_ref }} 2 $GITHUB_REF 3 ${{ github.ref }}"
 

CHANGELOG.md

@@ -7,6 +7,13 @@
 These are the changes to each version that has been released
 on the official Visual Studio extension gallery.
 
+## 2.3.0 (unreleased)
+
+- [x] NuGet-пакет `TypeScriptDefinitionGenerator.MSBuild` — MSBuild targets для автогенерации при сборке
+- [x] NuGet-пакет `TypeScriptDefinitionGenerator.Cli` — dotnet tool `tsdefgen`
+- [x] Rider-плагин добавляет `PackageReference` вместо `Directory.Build.targets` и `Import`
+- [x] Публикация пакетов в nuget.org через GitHub Actions
+
 ## 2.2.0
 - [x] Removed useless files
 - [x] Refactoring / code optimizing

GitVersion.yml

@@ -1,4 +1,4 @@
-next-version: 1.0.0 #
+next-version: 2.2.0
 branches:
   master:
     regex: ^master$|^main$

README-RIDER.md

@@ -4,13 +4,17 @@
 
 ## Способ 1: External Tool (рекомендуется)
 
-1. **Соберите и установите dotnet tool:**
+1. **Установите dotnet tool:**
+   ```bash
+   dotnet tool install -g TypeScriptDefinitionGenerator.Cli
+   ```
+   Или из исходников:
    ```bash
    cd src/TypeScriptDefinitionGenerator.Cli
    dotnet pack -c Release
    dotnet tool install -g --add-source ./bin/Release TypeScriptDefinitionGenerator.Cli
    ```
-   Или запускайте напрямую:
+   Или запускайте напрямую (без установки):
    ```bash
    dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- $FilePath$
    ```
@@ -19,7 +23,7 @@
    - **Settings** → **Tools** → **External Tools** → **Add**
    - **Name:** Generate TypeScript Definition
    - **Program:** `dotnet`
-   - **Arguments:** `run --project src/TypeScriptDefinitionGenerator.Cli -- $FilePath$`
+   - **Arguments:** `tsdefgen $FilePath$` (при установленном tool) или `run --project src/TypeScriptDefinitionGenerator.Cli -- $FilePath$` (при работе из исходников)
    - **Working directory:** `$ContentRoot$`
    - Включите **Synchronize files after execution**
 
@@ -30,11 +34,12 @@
 ## Способ 2: Запуск из терминала
 
 ```bash
-# Один файл (укажите путь к вашему .cs файлу)
-dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- path/to/YourDto.cs
+# Через dotnet tool (после: dotnet tool install -g TypeScriptDefinitionGenerator.Cli)
+dotnet tsdefgen path/to/YourDto.cs
+dotnet tsdefgen path/to/Dto1.cs path/to/Dto2.cs
 
-# Несколько файлов
-dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- path/to/Dto1.cs path/to/Dto2.cs
+# Или напрямую из исходников
+dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- path/to/YourDto.cs
 ```
 
 ## Конфигурация (tsdefgen.json)
@@ -57,7 +62,33 @@ dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- path/to/Dto1.cs pa
 
 ## Автогенерация при сборке (MSBuild)
 
-При изменении .cs файла можно автоматически перегенерировать .d.ts при сборке. Добавьте в .csproj:
+При изменении .cs файла можно автоматически перегенерировать .d.ts при сборке.
+
+### Вариант 1: NuGet-пакет (рекомендуется)
+
+```bash
+dotnet add package TypeScriptDefinitionGenerator.MSBuild
+```
+
+Пакет добавляет `DotNetToolReference` на `TypeScriptDefinitionGenerator.Cli` и MSBuild targets. Добавьте в .csproj:
+
+```xml
+<ItemGroup>
+  <PackageReference Include="TypeScriptDefinitionGenerator.MSBuild" Version="2.2.*" />
+</ItemGroup>
+
+<ItemGroup>
+  <TypeScriptDefinitionSource Include="Models\Dto.cs" />
+</ItemGroup>
+
+<ItemGroup>
+  <None Update="Models\Dto.generated.d.ts">
+    <DependentUpon>Dto.cs</DependentUpon>
+  </None>
+</ItemGroup>
+```
+
+### Вариант 2: Локальный targets (для разработки в репозитории TypeScriptDefinitionGenerator)
 
 ```xml
 <Import Project="path/to/build/TypeScriptDefinitionGenerator.targets" />
@@ -121,6 +152,6 @@ export JAVA_HOME=$(/usr/libexec/java_home -v 17)   # macOS
 Плагин запускает `dotnet run --project src/TypeScriptDefinitionGenerator.Cli -- <путь-к-файлу>` в каталоге решения.
 
 При успешной генерации плагин автоматически добавляет в .csproj:
-- `TypeScriptDefinitionSource` — для автогенерации при сборке
-- `None` с `DependentUpon` — для отображения в Solution Explorer
-- `Directory.Build.targets` — при первом запуске (если targets есть в `build/`)
+- `PackageReference` на `TypeScriptDefinitionGenerator.MSBuild` — MSBuild targets и dotnet tool для автогенерации при сборке
+- `TypeScriptDefinitionSource` — список .cs файлов для генерации
+- `None` с `DependentUpon` — для отображения .d.ts в Solution Explorer

README.md

@@ -1,6 +1,6 @@
 # TypeScript Definition Generator
 
-[![Build status](https://ci.appveyor.com/api/projects/status/lbuvy4vnkky4ycsb/branch/master?svg=true)](https://ci.appveyor.com/project/denis-peshkov/typescriptdefinitiongenerator/branch/master)
+[![.NET](https://github.com/denis-peshkov/TypeScriptDefinitionGenerator/actions/workflows/dotnet.yml/badge.svg)](https://github.com/denis-peshkov/TypeScriptDefinitionGenerator/actions/workflows/dotnet.yml)
 
 ## NOTE: This is a customed redistribute
 The orginal repo wrote by @madskristensen, **best regard for him**!
@@ -101,6 +101,24 @@ Configure this extension from the **Tools -> Options -> Text Editor -> JavaScrip
 
 ![Settings](art/settings.png)
 
+## NuGet (MSBuild + dotnet tool)
+
+Для автогенерации .d.ts при сборке добавьте пакет:
+
+```bash
+dotnet add package TypeScriptDefinitionGenerator.MSBuild
+```
+
+Пакет подключает MSBuild targets и dotnet tool `tsdefgen`. В .csproj добавьте:
+
+```xml
+<ItemGroup>
+  <TypeScriptDefinitionSource Include="Models\**\*.cs" />
+</ItemGroup>
+```
+
+См. [README-RIDER.md](README-RIDER.md) для полной конфигурации.
+
 ## JetBrains Rider
 
 Для использования в Rider см. [README-RIDER.md](README-RIDER.md) — плагин с контекстным меню, External Tool или dotnet tool для генерации .d.ts файлов.

TypeScriptDefinitionGenerator.slnx

@@ -1,14 +1,26 @@
 <Solution>
+  <Folder Name="/.github/">
+    <File Path=".github\CONTRIBUTING.md" />
+    <File Path=".github\ISSUE_TEMPLATE.md" />
+  </Folder>
+  <Folder Name="/.github/workflows/">
+    <File Path=".github\workflows\dotnet.yml" />
+  </Folder>
   <Folder Name="/assets/">
     <File Path=".gitignore" />
     <File Path="appveyor.yml" />
     <File Path="build-rider-plugin.sh" />
     <File Path="CHANGELOG.md" />
+    <File Path="GitVersion.yml" />
     <File Path="LICENSE" />
+    <File Path="overview.md" />
+    <File Path="publish-marketplace.ps1" />
     <File Path="README-RIDER.md" />
     <File Path="README.md" />
+    <File Path="vs-publish.json" />
   </Folder>
   <Project Path="src/TypeScriptDefinitionGenerator.Cli/TypeScriptDefinitionGenerator.Cli.csproj" />
+  <Project Path="src/TypeScriptDefinitionGenerator.MSBuild/TypeScriptDefinitionGenerator.MSBuild.csproj" />
   <Project Path="src/TypeScriptDefinitionGenerator.Core/TypeScriptDefinitionGenerator.Core.csproj" />
   <Project Path="src/TypeScriptDefinitionGenerator.Rider/TypeScriptDefinitionGenerator.Rider.csproj" />
   <Project Path="src/TypeScriptDefinitionGenerator/TypeScriptDefinitionGenerator.csproj" />

docs/PUBLISHING.md

@@ -0,0 +1,44 @@
+# Публикация в маркетплейсы
+
+## GitHub Actions (Repository → Settings → Secrets and variables → Actions)
+
+| Secret | Описание |
+|--------|----------|
+| `VS_MARKETPLACE_PAT` | Personal Access Token из Azure DevOps (Marketplace → Manage) для публикации VSIX в [Visual Studio Marketplace](https://marketplace.visualstudio.com/) |
+| `JETBRAINS_MARKETPLACE_TOKEN` | Permanent Token из [JetBrains Marketplace → My Tokens](https://plugins.jetbrains.com/author/me/tokens) для публикации Rider-плагина |
+| `NUGET_API_KEY` | API Key из [nuget.org → Account → API Keys](https://www.nuget.org/account/apikeys) для публикации пакетов TypeScriptDefinitionGenerator.Cli и TypeScriptDefinitionGenerator.MSBuild |
+
+## VS Marketplace (PAT)
+
+1. [Azure DevOps](https://dev.azure.com) → User settings → Personal access tokens
+2. New Token, Scope: **Marketplace** → **Manage**
+3. Добавить в GitHub как secret `VS_MARKETPLACE_PAT`
+
+## JetBrains Marketplace (Token)
+
+1. [plugins.jetbrains.com](https://plugins.jetbrains.com) → Author → My Tokens
+2. Create new token
+3. Добавить в GitHub как secret `JETBRAINS_MARKETPLACE_TOKEN`
+
+## NuGet.org (API Key)
+
+1. [nuget.org](https://www.nuget.org) → Account → API Keys
+2. Create → Generate new key (Scope: Push new packages)
+3. Добавить в GitHub как secret `NUGET_API_KEY`
+
+Публикуются пакеты: `TypeScriptDefinitionGenerator.Cli` (dotnet tool), `TypeScriptDefinitionGenerator.MSBuild` (MSBuild targets).
+
+## Локальная публикация
+
+```powershell
+# После сборки (msbuild + build-rider-plugin.sh)
+$env:VS_MARKETPLACE_PAT = "your-pat"
+$env:JETBRAINS_MARKETPLACE_TOKEN = "your-token"
+.\publish-marketplace.ps1 -VsixPath "src\TypeScriptDefinitionGenerator\bin\Release\TypeScriptDefinitionGenerator.vsix"
+```
+
+```powershell
+# Публикация NuGet-пакетов
+$env:NUGET_API_KEY = "your-api-key"
+dotnet nuget push artifacts/nuget/*.nupkg --source https://api.nuget.org/v3/index.json --api-key $env:NUGET_API_KEY --skip-duplicate
+```

overview.md

@@ -0,0 +1,23 @@
+# TypeScript Definition Generator
+
+Creates and synchronizes TypeScript Definition files (`.d.ts`) from C# model classes (DTO) to build strongly typed web applications where the server and client-side models are in sync. Works on all .NET project types.
+
+## Features
+
+- Right-click any `.cs` file and select **Generate TypeScript Definition** to create a `.generated.d.ts` file
+- Automatically updates `.d.ts` when the C# file is modified and saved
+- Supports classes, interfaces, enums, inheritance, and XML documentation
+- Configurable: camelCase, module format, EOL, indentation
+
+## NuGet
+
+For MSBuild integration and CI/CD: `dotnet add package TypeScriptDefinitionGenerator.MSBuild` — adds targets for build-time generation.
+
+## JetBrains Rider
+
+For Rider, see [README-RIDER.md](https://github.com/denis-peshkov/TypeScriptDefinitionGenerator/blob/master/README-RIDER.md) — plugin with context menu, External Tool, or dotnet tool.
+
+## Links
+
+- [GitHub](https://github.com/denis-peshkov/TypeScriptDefinitionGenerator)
+- [Changelog](https://github.com/denis-peshkov/TypeScriptDefinitionGenerator/blob/master/CHANGELOG.md)

publish-marketplace.ps1

@@ -0,0 +1,62 @@
+# Publish TypeScript Definition Generator to marketplaces
+# Requires: $env:VS_MARKETPLACE_PAT (Azure DevOps PAT), $env:JETBRAINS_MARKETPLACE_TOKEN
+# Run from repo root after build
+
+param(
+    [string]$VsixPath = "",
+    [string]$RiderZipPath = "output\TypeScriptDefinitionGenerator.Rider-1.0.0.zip"
+)
+
+$ErrorActionPreference = "Stop"
+
+# --- Visual Studio Marketplace ---
+if ($env:VS_MARKETPLACE_PAT) {
+    if (-not $VsixPath) {
+        $vsixFiles = Get-ChildItem -Path . -Filter "*.vsix" -Recurse -ErrorAction SilentlyContinue |
+            Where-Object { $_.FullName -like "*TypeScriptDefinitionGenerator*" -and $_.FullName -notlike "*obj*" }
+        $VsixPath = $vsixFiles | Sort-Object LastWriteTime -Descending | Select-Object -First 1 -ExpandProperty FullName
+    }
+    if ($VsixPath -and (Test-Path $VsixPath)) {
+        Write-Host "Publishing to Visual Studio Marketplace..." -ForegroundColor Cyan
+        $vsPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property installationPath 2>$null
+        $vsixPublisher = Join-Path $vsPath "VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe"
+        if (-not (Test-Path $vsixPublisher)) {
+            $vsixPublisher = Join-Path $vsPath "Common7\IDE\Extensions\Microsoft\Vsix\VsixPublisher.exe"
+        }
+        if (Test-Path $vsixPublisher) {
+            $publishManifest = Join-Path $PSScriptRoot "vs-publish.json"
+            & $vsixPublisher publish -payload $VsixPath -publishManifest $publishManifest -personalAccessToken $env:VS_MARKETPLACE_PAT
+            Write-Host "VS Marketplace: OK" -ForegroundColor Green
+        } else {
+            Write-Warning "VsixPublisher.exe not found. Install Visual Studio SDK workload."
+        }
+    } else {
+        Write-Warning "VSIX file not found. Build the project first."
+    }
+} else {
+    Write-Host "VS_MARKETPLACE_PAT not set, skipping VS Marketplace" -ForegroundColor Yellow
+}
+
+# --- JetBrains Marketplace ---
+if ($env:JETBRAINS_MARKETPLACE_TOKEN) {
+    if (Test-Path $RiderZipPath) {
+        Write-Host "Publishing to JetBrains Marketplace..." -ForegroundColor Cyan
+        $xmlId = "com.typescriptdefinitiongenerator.rider"
+        $riderPath = (Resolve-Path $RiderZipPath).Path
+        $curlOut = & curl.exe -s -w "`n%{http_code}" -X POST `
+            -H "Authorization: Bearer $env:JETBRAINS_MARKETPLACE_TOKEN" `
+            -F "xmlId=$xmlId" `
+            -F "file=@$riderPath" `
+            "https://plugins.jetbrains.com/api/updates/upload" 2>&1
+        $result = ($curlOut -split "`n")[-1]
+        if ($result -eq "200" -or $result -eq "201") {
+            Write-Host "JetBrains Marketplace: OK" -ForegroundColor Green
+        } else {
+            Write-Error "JetBrains upload failed (HTTP $result)"
+        }
+    } else {
+        Write-Warning "Rider plugin zip not found: $RiderZipPath"
+    }
+} else {
+    Write-Host "JETBRAINS_MARKETPLACE_TOKEN not set, skipping JetBrains Marketplace" -ForegroundColor Yellow
+}

rider/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.typescriptdefinitiongenerator"
-version = "1.0.0"
+version = project.findProperty("version") as String? ?: "1.0.0"
 
 repositories {
     mavenCentral()