Compare commits

..

No commits in common. "master" and "1.0.7402.26" have entirely different histories.

9 changed files with 442 additions and 468 deletions

79
.github/workflows/main.yml vendored Normal file
View File

@ -0,0 +1,79 @@
name: CD
on:
push:
branches:
- master
jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Build
id: base_init
run: |
echo "download tools"
$(new-object System.Net.WebClient).DownloadFile("https://www.github.com/JFronny/UpTool2/releases/latest/download/Tools.zip", "$($(pwd).Path)\Tools.zip")
echo "unzip"
& "C:\Program Files\7-Zip\7z.exe" x .\Tools.zip
echo "remove leftovers"
rm Tools.zip
rm Install.bat
rm Remove.bat
echo "restore"
dotnet restore
echo "build"
& "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" -noLogo -verbosity:m -p:Configuration=Release
echo "copy"
cp *\bin\Release\net461\package.zip .
echo "get timespan"
[timespan]$span = [System.DateTime]::Now - [datetime]'01/01/2000'
echo "get version string"
$asmver = "1.0." + $span.Days.ToString() + "." + [math]::Round($span.Seconds / 2).ToString()
echo "set output"
echo "::set-output name=vers::$asmver"
- name: Create Release
id: create_release
uses: actions/create-release@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.base_init.outputs.vers }}
release_name: Release ${{ steps.base_init.outputs.vers }}
draft: false
prerelease: false
- name: Upload Release Asset
id: upload_release_asset
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./package.zip
asset_name: package.zip
asset_content_type: application/zip
- name: Generate XML
run: |
$asm = $([Reflection.Assembly]::LoadFile($(Get-Item $(Resolve-Path *\bin\Release\net461\*.exe).Path).FullName))
[System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
[System.XML.XMLElement]$app=$xml.CreateElement("app")
$xml.appendChild($app)
$app.appendChild($xml.CreateElement("Name")).InnerText = $asm.GetName().Name
$app.appendChild($xml.CreateElement("Description")).InnerText = "A basic GUI for multiple common programming languages including c# and HTML"
$app.appendChild($xml.CreateElement("Version")).InnerText = "${{ steps.base_init.outputs.vers }}"
$app.appendChild($xml.CreateElement("ID")).InnerText = "63d64672-3ca3-4760-96a3-443b262d326f"
$app.appendChild($xml.CreateElement("File")).InnerText = "${{ steps.upload_release_asset.outputs.browser_download_url }}"
$app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
$app.appendChild($xml.CreateElement("MainFile")).InnerText = $file.Name
echo NULL > app.xml
$xml.save($(gi .\app.xml).Fullname)
- name: Upload XML
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./app.xml
asset_name: app.xml
asset_content_type: text/xml

View File

@ -1,48 +0,0 @@
.shared_windows_runners:
tags:
- windows
uptool:
extends:
- .shared_windows_runners
stage: deploy
script: |
mkdir i
cd i
$(new-object System.Net.WebClient).DownloadFile("https://gitlab.com/JFronny/UpTool2/-/jobs/artifacts/master/raw/Installer-generic.zip?job=uptool", "$($(pwd).Path)\Install.zip")
& "C:\Program Files\7-Zip\7z.exe" x .\Install.zip
.\Installer.exe --basic i -p
cd ..
rm -R i
$Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Install"
uptool --basic add-repo DevTools https://gitlab.com/JFronny/UpTool2/-/snippets/2010392/raw
uptool --basic update
uptool --basic install "UpTool2 package tools"
$Env:Path="$Env:Path;$Env:APPDATA\UpTool2\Apps\0e35d154-d0d3-45e0-b080-62f521263a44\app"
dotnet restore
mkdir .\build
& "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe" -noLogo -verbosity:m -p:Configuration=Release
cp .\cashew\bin\Release\net461\* .\build\
cp .\build\package.zip .\
$file = Get-Item $(Resolve-Path .\build\*.exe).Path
[timespan]$span = [System.DateTime]::Now - [datetime]'01/01/2000'
[System.XML.XMLDocument]$xml=New-Object System.XML.XMLDocument
[System.XML.XMLElement]$app=$xml.CreateElement("app")
$xml.appendChild($app)
$app.appendChild($xml.CreateElement("Name")).InnerText = "Cashew"
$app.appendChild($xml.CreateElement("Description")).InnerText = "A basic GUI for multiple common programming languages including c# and HTML"
$app.appendChild($xml.CreateElement("Version")).InnerText = "1.0." + $span.Days.ToString() + "." + [math]::Round(($span.Seconds + ($span.Minutes + $span.Hours * 60) * 60) / 2).ToString()
$app.appendChild($xml.CreateElement("ID")).InnerText = "63d64672-3ca3-4760-96a3-443b262d326f"
$app.appendChild($xml.CreateElement("File")).InnerText = $CI_PROJECT_URL + "/-/jobs/" + $CI_JOB_ID + "/artifacts/raw/package.zip"
$app.appendChild($xml.CreateElement("Hash")).InnerText = $(Get-FileHash .\package.zip).Hash
$app.appendChild($xml.CreateElement("MainFile")).InnerText = "cashew.exe"
$app.appendChild($xml.CreateElement("Icon")).InnerText = "https://gitlab.com/JFronny/cashew/-/raw/master/cashew/Cashew-64.ico"
echo NULL > app.xml
$xml.save($(gi .\app.xml).Fullname)
artifacts:
paths:
- package.zip
- app.xml
only:
- master

21
LICENSE
View File

@ -1,21 +0,0 @@
MIT License
Copyright (c) 2020 J. Fronny
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@ -1,2 +1,2 @@
# cashew
A basic GUI for multiple common programming languages including c# and HTML [![UpTool2](https://img.shields.io/badge/Get%20it-on%20UpTool2-blue)](https://jfronny.gitlab.io/home/uptool)
A basic GUI for multiple common programming languages including c# and HTML [![UpTool2](https://img.shields.io/github/v/tag/JFronny/cashew?color=informational&label=UpTool2)](https://jfronny.github.io/home/uptool)

File diff suppressed because it is too large Load Diff

View File

@ -237,7 +237,7 @@ namespace cashew
}
catch (Exception e1)
{
if (!e1.TryCast(out ThreadAbortException ex))
if (!e1.tryCast(out ThreadAbortException ex))
Invoke((MethodInvoker) delegate
{
MetroMessageBox.Show(this, e1.Message, "Execution Failed",
@ -619,7 +619,7 @@ namespace cashew
}
catch (Exception e1)
{
if (!e1.TryCast(out ThreadAbortException _))
if (!e1.tryCast(out ThreadAbortException _))
Invoke((MethodInvoker) delegate
{
MetroMessageBox.Show(this, e1.Message, "Execution Failed", MessageBoxButtons.OK,

View File

@ -10,8 +10,7 @@ namespace cashew
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Console.Title = "The Cashew Project - Native Shell (do not close)";
Console.WriteLine("Welcome to Cashew. Your programs output will be redirected here");
Console.Title = "The Cashew Project - Native Shell";
Application.Run(new MainForm());
}
}

View File

@ -19,10 +19,10 @@
<Content Include="Cashew-64.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CC-Functions.Misc" Version="1.1.7474.36199" />
<PackageReference Include="CC-Functions.Misc" Version="1.1.7399.26972" />
<PackageReference Include="ICSharpCode.Decompiler" Version="5.0.2.5153" />
<PackageReference Include="ICSharpCode.TextEditor.Extended" Version="4.2.4" />
<PackageReference Include="IronPython" Version="2.7.10" />
<PackageReference Include="IronPython" Version="2.7.9" />
<PackageReference Include="ModernUI" Version="2.0.0" />
</ItemGroup>
<PropertyGroup>

View File

@ -1,5 +0,0 @@
{
"extends": [
"config:base"
]
}