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

chore: Merge branch dev to main #33

Merged
merged 44 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
47f5fc2
build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.3
dependabot[bot] Apr 29, 2024
bcfc51e
build(deps): bump Microsoft.Web.WebView2 from 1.0.2277.86 to 1.0.2478.35
dependabot[bot] Apr 29, 2024
7af4904
build(deps): bump Microsoft.Web.WebView2 from 1.0.2277.86 to 1.0.2478…
PocketMiner82 Apr 29, 2024
7171ce8
build(deps): bump actions/upload-artifact from 4.3.1 to 4.3.3 (#31)
PocketMiner82 Apr 29, 2024
aa1db2a
build(deps): bump Scintilla5.NET from 5.3.3.18 to 5.4.0
dependabot[bot] May 13, 2024
5d1414c
build(deps): bump Autoupdater.NET.Official from 1.8.5 to 1.8.6
dependabot[bot] May 13, 2024
9d4cdea
build(deps): bump Scintilla5.NET from 5.3.3.18 to 5.4.0 (#34)
PocketMiner82 May 13, 2024
7ac59c8
build(deps): bump Autoupdater.NET.Official from 1.8.5 to 1.8.6 (#35)
PocketMiner82 May 13, 2024
07b2cc3
build(deps): bump Scintilla5.NET from 5.4.0 to 5.5.1
dependabot[bot] May 20, 2024
a9d9bc1
build(deps): bump Scintilla5.NET from 5.4.0 to 5.5.1 (#36)
PocketMiner82 May 20, 2024
7d6be51
build(deps): bump Microsoft.Web.WebView2 from 1.0.2478.35 to 1.0.2535.41
dependabot[bot] Jun 3, 2024
566160b
build(deps): bump Microsoft.Web.WebView2 from 1.0.2478.35 to 1.0.2535…
PocketMiner82 Jun 4, 2024
aee2766
build(deps): bump Autoupdater.NET.Official from 1.8.6 to 1.9.0
dependabot[bot] Jun 10, 2024
d920a30
build(deps): bump Autoupdater.NET.Official from 1.8.6 to 1.9.0 (#38)
PocketMiner82 Jun 10, 2024
4fb1100
build(deps): bump Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAna…
dependabot[bot] Jun 17, 2024
2b61ba9
build(deps): bump Microsoft.CodeAnalysis.Common from 4.9.2 to 4.10.0
dependabot[bot] Jun 17, 2024
6972892
build(deps): bump Microsoft.CodeAnalysis.Common from 4.9.2 to 4.10.0 …
PocketMiner82 Jun 17, 2024
9c616fa
build(deps): bump Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAna…
PocketMiner82 Jun 17, 2024
638f7f0
build(deps): bump Microsoft.Web.WebView2 from 1.0.2535.41 to 1.0.2592.51
dependabot[bot] Jun 24, 2024
0545144
build(deps): bump Microsoft.Web.WebView2 from 1.0.2535.41 to 1.0.2592…
PocketMiner82 Jun 24, 2024
df31818
build(deps): bump Autoupdater.NET.Official from 1.9.0 to 1.9.1
dependabot[bot] Jun 24, 2024
89eb705
build(deps): bump Autoupdater.NET.Official from 1.9.0 to 1.9.1 (#42)
PocketMiner82 Jun 24, 2024
3bb0d42
build(deps): bump actions/upload-artifact from 4.3.3 to 4.3.4
dependabot[bot] Jul 8, 2024
016fa4d
build(deps): bump actions/upload-artifact from 4.3.3 to 4.3.4 (#43)
PocketMiner82 Jul 8, 2024
76d82d3
build(deps): bump Scintilla5.NET from 5.5.1 to 5.6.0
dependabot[bot] Jul 15, 2024
18d0a97
build(deps): bump Scintilla5.NET from 5.5.1 to 5.6.0 (#44)
PocketMiner82 Jul 16, 2024
bc95ea5
build(deps): bump Scintilla5.NET from 5.6.0 to 5.6.1
dependabot[bot] Aug 5, 2024
7378e66
build(deps): bump Autoupdater.NET.Official from 1.9.1 to 1.9.2
dependabot[bot] Aug 5, 2024
554444a
build(deps): bump actions/upload-artifact from 4.3.4 to 4.3.5
dependabot[bot] Aug 5, 2024
3448bff
build(deps): bump Scintilla5.NET from 5.6.0 to 5.6.1 (#45)
PocketMiner82 Aug 5, 2024
e346d51
build(deps): bump Autoupdater.NET.Official from 1.9.1 to 1.9.2 (#46)
PocketMiner82 Aug 5, 2024
7e67f50
build(Needs bump): bump actions/upload-artifact from 4.3.4 to 4.3.5 (…
PocketMiner82 Aug 5, 2024
4ea1b59
chore(release): 1.6.4-dev.1 [skip ci]
semantic-release-bot Aug 5, 2024
e99ef49
build(deps): bump actions/upload-artifact from 4.3.5 to 4.3.6
dependabot[bot] Aug 12, 2024
4a14ac7
build(deps): bump actions/upload-artifact from 4.3.5 to 4.3.6 (#48)
PocketMiner82 Aug 12, 2024
a9b17b5
build(deps): bump Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAna…
dependabot[bot] Aug 19, 2024
ef70cad
build(deps): bump Microsoft.Web.WebView2 from 1.0.2592.51 to 1.0.2651.64
dependabot[bot] Aug 19, 2024
14d5733
build(deps): bump Microsoft.CodeAnalysis.CSharp and Microsoft.CodeAna…
PocketMiner82 Aug 20, 2024
74805b6
build(Needs bump): bump Microsoft.Web.WebView2 from 1.0.2592.51 to 1.…
PocketMiner82 Aug 20, 2024
9a891ba
chore(release): 1.6.4-dev.2 [skip ci]
semantic-release-bot Aug 20, 2024
8a3509f
build(deps): bump Microsoft.Web.WebView2 from 1.0.2651.64 to 1.0.2739.15
dependabot[bot] Sep 2, 2024
be8101a
build(deps): bump actions/upload-artifact from 4.3.6 to 4.4.0
dependabot[bot] Sep 2, 2024
02d8192
build(deps): bump Microsoft.Web.WebView2 from 1.0.2651.64 to 1.0.2739…
PocketMiner82 Sep 5, 2024
04c1487
build(deps): bump actions/upload-artifact from 4.3.6 to 4.4.0 (#52)
PocketMiner82 Sep 5, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Restore Packages and build solution
run: ".\\build.cmd nozip"
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.3.1
uses: actions/upload-artifact@v4.4.0
with:
# Artifact name
name: pseudocode-ide
Expand Down
6 changes: 3 additions & 3 deletions AutoUpdater.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.6.3</version>
<url>https://github.com/PocketMiner82/pseudocode-ide/releases/download/1.6.3/pseudocode-ide.zip</url>
<changelog>https://github.com/PocketMiner82/pseudocode-ide/blob/1.6.3/CHANGELOG.md</changelog>
<version>1.6.4.2</version>
<url>https://github.com/PocketMiner82/pseudocode-ide/releases/download/1.6.4-dev.2/pseudocode-ide.zip</url>
<changelog>https://github.com/PocketMiner82/pseudocode-ide/blob/1.6.4-dev.2/CHANGELOG.md</changelog>
<mandatory>false</mandatory>
</item>
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [1.6.4-dev.2](https://github.com/PocketMiner82/pseudocode-ide/compare/1.6.4-dev.1...1.6.4-dev.2) (2024-08-20)

## [1.6.4-dev.1](https://github.com/PocketMiner82/pseudocode-ide/compare/1.6.3...1.6.4-dev.1) (2024-08-05)

## [1.6.3](https://github.com/PocketMiner82/pseudocode-ide/compare/1.6.2...1.6.3) (2024-04-20)


Expand Down
8 changes: 4 additions & 4 deletions pseudocodeIde/pseudocodeIde.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AssemblyTitle>pseudocode-ide</AssemblyTitle>
<Company>PocketMiner82</Company>
<Product>pseudocode-ide</Product>
<version>1.6.3</version>
<version>1.6.4.2</version>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
</PropertyGroup>
Expand Down Expand Up @@ -45,11 +45,11 @@
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="4.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Scintilla5.NET" Version="5.3.3.18" />
<PackageReference Include="Scintilla5.NET" Version="5.6.1" />
<PackageReference Include="ScintillaNET_FindReplaceDialog" Version="1.5.5" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
Expand Down
6 changes: 3 additions & 3 deletions pseudocodeIdeUpdater/pseudocodeIdeUpdater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Product>pseudocodeIdeUpdater</Product>
<Copyright>Copyright © 2023</Copyright>
<OutputPath>..\bin\$(Configuration)\updater\</OutputPath>
<version>1.6.3</version>
<version>1.6.4.2</version>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
Expand All @@ -23,8 +23,8 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Autoupdater.NET.Official" Version="1.8.5" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2277.86" />
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
</ItemGroup>
<ItemGroup>
<Reference Include="PresentationFramework" />
Expand Down