Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DotNet minimum version dependency set to version 8 #155

Merged
merged 7 commits into from
May 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ on:
branches:
- main
workflow_dispatch:
branches:
- main

jobs:
deploy:
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4.1.4

- name: Install vsce and open vsx
run: |
Expand Down
24 changes: 8 additions & 16 deletions .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout branch
uses: actions/[email protected].2
uses: actions/[email protected].4

- name: "Get changed files"
id: getChangedFiles
Expand All @@ -34,17 +34,12 @@ jobs:
}
Write-Host "Pass ✅"

- name: Install SemVer PS modules
shell: pwsh
run: |
Set-PSRepository PSGallery -InstallationPolicy Trusted
Install-Module -Name PoshSemanticVersion

- name: Get current version from package.json
id: getpackageversion
shell: pwsh
run: |
$version = ((Get-Content .\package.json | ConvertFrom-Json).version).ToString()
$package = Get-Content .\package.json | ConvertFrom-Json
$version = $package.version
Write-Host 'Current version from package.json: ' $version
"VERSION=$version" >> $env:GITHUB_OUTPUT

Expand All @@ -66,16 +61,13 @@ jobs:
id: compare
shell: pwsh
run: |
Import-Module PoshSemanticVersion
$com = Compare-SemanticVersion ${{ steps.getpackageversion.outputs.VERSION }} ${{ steps.getPublishedVersion.outputs.PUB_VERSION }}

if ($com.Precedence -eq '>') {
$localVersion = [System.Version]('${{ steps.getpackageversion.outputs.VERSION }}')
$storeVersion = [System.Version]('${{ steps.getPublishedVersion.outputs.PUB_VERSION }}')
if ($localVersion -gt $storeVersion) {
Write-Host "Version in package.json is higher than latest published version"
Write-Host "Pass"
}
elseif ($com.Precedence -eq '<') {
throw [System.Exception]("Version can not be lesser than latest published version. Update package version")
}
else {
throw [System.Exception]("Version can not be same as latest published version. Update package version")
throw [System.Exception]("Version can not be same as latest published version ❌! Update package version.")
}
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Stable

## 5.0.0: 11-May-2024

- Updated Dotnet dependency to version 8.

## 4.5.1: 16-Apr-2024

- Yarn upgrades.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Right Click and Select Prettify XML or use [shortcut](#keyboard-shortcuts)
- No empty lines.
- Supports `'` and whitespace unicodes in attribute value for XAML parser compatibility.

**Before**
Before

![Before.](./images/before.png)

Expand Down Expand Up @@ -159,7 +159,7 @@ Value = 2

## Requirements

- [**.Net 6** or later](https://dotnet.microsoft.com/en-us/download/dotnet) installed on your machine and should be accessible through terminal.
- [**DotNet 8** or later](https://dotnet.microsoft.com/en-us/download/dotnet) installed on your machine and should be accessible through terminal.
- Install [Muhammad-Sammy C#](https://open-vsx.org/extension/muhammad-sammy/csharp) or [Microsoft C#](https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp) extension.
- Visual Studio Code/VSCodium 1.59 or higher.

Expand Down
4 changes: 2 additions & 2 deletions lib/XmlFormatter.CommandLine.deps.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"runtimeTarget": {
"name": ".NETCoreApp,Version=v6.0",
"name": ".NETCoreApp,Version=v8.0",
"signature": ""
},
"compilationOptions": {},
"targets": {
".NETCoreApp,Version=v6.0": {
".NETCoreApp,Version=v8.0": {
"XmlFormatter.CommandLine/1.0.0": {
"dependencies": {
"XmlFormatter": "1.0.0"
Expand Down
Binary file modified lib/XmlFormatter.CommandLine.dll
Binary file not shown.
Binary file modified lib/XmlFormatter.CommandLine.exe
Binary file not shown.
Binary file modified lib/XmlFormatter.CommandLine.pdb
Binary file not shown.
7 changes: 4 additions & 3 deletions lib/XmlFormatter.CommandLine.runtimeconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"runtimeOptions": {
"tfm": "net6.0",
"tfm": "net8.0",
"framework": {
"name": "Microsoft.NETCore.App",
"version": "6.0.0"
"version": "8.0.0"
},
"configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
"System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
}
}
}
Binary file modified lib/XmlFormatter.dll
Binary file not shown.
Binary file modified lib/XmlFormatter.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"readme": "https://github.com/pmahend1/PrettyXML/blob/main/README.md",
"description": "XML formatter extension for Visual Studio Code. Formats XML documents just like Visual Studio.",
"version": "4.5.1",
"version": "5.0.0",
"publisher": "PrateekMahendrakar",
"repository": {
"url": "https://github.com/pmahend1/prettyxml.git"
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@
integrity sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==

"@types/node@^16.4.13":
version "16.18.96"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.96.tgz#eb0012d23ff53d14d64ec8a352bf89792de6aade"
integrity sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==
version "16.18.97"
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.97.tgz#d7926a8030f0d714d555b4550c0cc7731495cfe5"
integrity sha512-4muilE1Lbfn57unR+/nT9AFjWk0MtWi5muwCEJqnOvfRQDbSfLCUdN7vCIg8TYuaANfhLOV85ve+FNpiUsbSRg==

"@types/vscode@^1.59.0":
version "1.88.0"
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.88.0.tgz#2dc690237f7ef049942508c8609b6b9f5216b4d3"
integrity sha512-rWY+Bs6j/f1lvr8jqZTyp5arRMfovdxolcqGi+//+cPDOh8SBvzXH90e7BiSXct5HJ9HGW6jATchbRTpTJpEkw==
version "1.89.0"
resolved "https://registry.yarnpkg.com/@types/vscode/-/vscode-1.89.0.tgz#df0beb3f4ab9133ee8c5fcac8fc578e4623d8749"
integrity sha512-TMfGKLSVxfGfoO8JfIE/neZqv7QLwS4nwPwL/NwMvxtAY2230H2I4Z5xx6836pmJvMAzqooRQ4pmLm7RUicP3A==

"@typescript-eslint/eslint-plugin@^4.29.0":
version "4.33.0"
Expand Down