diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0206538..99238f3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,12 +27,5 @@ jobs: with: dotnet-version: 6.0.x - - name: Build .NET Standard 2.1 - run: dotnet build -c Release -f netstandard2.1 - - - name: Build .NET Framework 4.7.2 - run: dotnet build -c Release -f net472 - - - name: List build artifacts - shell: pwsh - run: Get-ChildItem -Path .\bin\Release -Recurse \ No newline at end of file + - name: Build + run: dotnet publish \ No newline at end of file diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 614efdb..219c279 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -24,16 +24,13 @@ jobs: with: dotnet-version: 6.0.x - - name: Build .NET Standard 2.1 - run: dotnet build -c Release -f netstandard2.1 - - - name: Build .NET Framework 4.7.2 - run: dotnet build -c Release -f net472 + - name: Build + run: dotnet publish -o psedit - name: Release run: | Install-Module Microsoft.PowerShell.PSResourceGet -Scope CurrentUser -Force - Publish-PSResource -Path .\bin\Release -ApiKey $Env:APIKEY + Publish-PSResource -Path .\psedit -ApiKey $Env:APIKEY env: APIKEY: ${{ secrets.APIKEY }} shell: pwsh diff --git a/.vscode/launch.json b/.vscode/launch.json index 8111e12..3136a0d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -15,7 +15,7 @@ "-Command", "& { Import-Module .\\psedit.psd1; Show-PSEditor}" ], - "cwd": "${workspaceFolder}\\bin\\Debug", + "cwd": "${workspaceFolder}\\bin\\Debug\\netstandard2.0\\publish", "console": "externalTerminal", "stopAtEntry": false }, @@ -30,7 +30,7 @@ "-Command", "& { Import-Module .\\psedit.psd1; Show-PSEditor}" ], - "cwd": "${workspaceFolder}\\bin\\Debug", + "cwd": "${workspaceFolder}\\bin\\Debug\\netstandard2.0\\publish", "console": "externalTerminal", "stopAtEntry": false }, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 31c32bd..7f573f8 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,7 @@ "command": "dotnet", "type": "shell", "args": [ - "build", + "publish", // Ask dotnet build to generate full paths for file names. "/property:GenerateFullPaths=true", // Do not generate summary otherwise it leads to duplicate errors in Problems panel diff --git a/psedit.csproj b/psedit.csproj index 3d815ba..daef2aa 100644 --- a/psedit.csproj +++ b/psedit.csproj @@ -1,48 +1,19 @@ - netstandard2.1;net472 - false + netstandard2.0 - + - - - true - bin\Debug\coreclr\ - - - - bin\Debug\clr\ - - - - - - - - - - true - bin\Release\coreclr\ - - - - bin\Release\clr\ - - - - - - + + + Always + + - + \ No newline at end of file diff --git a/psedit.psd1 b/psedit.psd1 index e14563b..f630e7e 100644 --- a/psedit.psd1 +++ b/psedit.psd1 @@ -9,14 +9,7 @@ @{ # Script module or binary module file associated with this manifest. - RootModule = if($PSEdition -eq 'Core') - { - 'coreclr\psedit.dll' - } - else # Desktop - { - 'clr\psedit.dll' - } + RootModule = 'psedit.dll' # Version number of this module. ModuleVersion = '0.0.7'