Merge pull request #26 from mega6453/mega_proxy

iOS >=17.4 support
mega6453 · Jun 30, 2024 · f1df90f · f1df90f
2 parents c902c70 + 70b7d8a
commit f1df90f
Show file tree

Hide file tree

Showing 35 changed files with 1,965 additions and 920 deletions.
diff --git a/.github/workflows/executable-artifact.yml b/.github/workflows/executable-artifact.yml
@@ -0,0 +1,96 @@
+name: Executable Artifact
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+    runs-on: windows-latest
+    env:
+      Solution_Name: Appium Wizard
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Update Google Analytics Secrets
+      shell: pwsh
+      env:
+        APISecret: ${{ secrets.GOOGLEANALYTICSAPISECRET }}
+        MeasurementId: ${{ secrets.GOOGLEANALYTICSMEASUREMENTID }}
+      run: |
+        $googleAnalyticsFilePath = "$env:GITHUB_WORKSPACE\Appium Wizard\GoogleAnalytics.cs"
+        (Get-Content -Path $googleAnalyticsFilePath) -replace "{GOOGLEANALYTICSAPISECRET}",   "$env:APISecret" | Set-Content -Path $googleAnalyticsFilePath
+        (Get-Content -Path $googleAnalyticsFilePath) -replace "{GOOGLEANALYTICSMEASUREMENTID}",  "$env:MeasurementId" | Set-Content -Path $googleAnalyticsFilePath
+      
+    - name: Install .NET Core
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 6.0.x
+
+    # - name: Setup MSBuild.exe
+    #   uses: microsoft/[email protected]
+
+    - name: Restore the application
+      run: dotnet restore $env:Solution_Name
+      env:
+        Solution_Name: Appium Wizard
+
+    # - name: Build the solution
+    #   run: dotnet publish -r win-x64 $env:Solution_Name /p:Configuration=$env:Configuration /p:SelfContained=true /p:PublishSingleFile=true /p:ReadyToRun=true /p:IncludeNativeLibrariesForSelfExtract=true
+    #   env:
+    #     Configuration: ${{ matrix.configuration }}
+
+    - name: Build and publish app
+      run: dotnet publish -c Release -r win-x64 --self-contained true /p:PublishSingleFile=true /p:ReadyToRun=true   
+
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: app
+        path: "Appium Wizard/bin/Release/net6.0-windows/win-x64/publish"
+
+    - name: Install Chocolatey
+      run: |
+        Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+
+    - name: Install Inno Setup
+      run: |
+        choco install innosetup -y
+
+       
+    - name: Compile and generate EXE file
+      run: |
+        ISCC /Q "${{ env.SCRIPT_PATH }}"
+      env:
+        SCRIPT_PATH: "Appium Wizard/bin/Release/net6.0-windows/win-x64/publish/ExcludeInInstaller/Installer Script.iss"  
+
+    - name: Zip the EXE file
+      run: |
+        $exePath = "Appium Wizard/bin/Release/net6.0-windows/win-x64/publish/output/AppiumWizard.exe"
+        $zipPath = Join-Path (Split-Path $exePath) "AppiumWizard.zip"
+        Compress-Archive -Path $exePath -DestinationPath $zipPath
+
+    - name: Get Version
+      id: get_version
+      run: |
+        $versionFilePath = "$env:GITHUB_WORKSPACE\Appium Wizard\VersionInfo.cs"
+        $version = Select-String -Pattern 'VersionNumber\s*=\s*"(.*)";' -Path $versionFilePath | ForEach-Object { $_.Matches.Groups[1].Value }
+        $releaseNotes = Select-String -Pattern 'ReleaseNotes\s*=\s*"(.*)";' -Path $versionFilePath | ForEach-Object { $_.Matches.Groups[1].Value }
+        echo "::set-output name=version::$version"
+        echo "::set-output name=releasenotes::$releaseNotes"
+      shell: pwsh
+      env:
+        Solution_Name: Appium Wizard
+        DOTNET_ROOT: C:\Program Files\dotnet
+
+    - name: Upload AppiumWizard.zip artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: AppiumWizard
+        path: AppiumWizard/bin/Release/net6.0-windows/win-x64/publish/output/AppiumWizard.zip
diff --git a/Appium Wizard/Appium Wizard.csproj b/Appium Wizard/Appium Wizard.csproj
@@ -85,6 +85,9 @@
     <None Update="Resources\Executables\iOSServer.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Resources\Executables\iOSServerPy.zip">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Resources\Executables\iproxy.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -127,10 +130,10 @@
     <None Update="Resources\iOS\openssl.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Resources\iOS\wda.ipa">
+    <None Update="Resources\iOS\unzip.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Resources\iOS\unzip.exe">
+    <None Update="Resources\iOS\wda.ipa">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Resources\iOS\zip.exe">

diff --git a/Appium Wizard/Appium Wizard.csproj.user b/Appium Wizard/Appium Wizard.csproj.user
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>C:\Users\mc\source\repos\Appium Wizard\Appium Wizard\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>C:\Users\DELL\source\repos\AppiumWizard\Appium Wizard\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
   <ItemGroup>
     <Compile Update="About.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="Android Wireless.cs">
+    <Compile Update="Android Wireless Manual.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Update="Android Wireless Manual.cs">
+    <Compile Update="Android Wireless.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Update="CommonProgress.cs">
@@ -60,6 +60,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Update="MainScreen.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Update="Properties\Resources.resx">
       <SubType>Designer</SubType>
     </EmbeddedResource>