Merge pull request #10 from exendahal/fix/change_project_directory

Change project directory
exendahal · Sep 14, 2024 · bbcdfe5 · bbcdfe5
2 parents 6ae6553 + e14fa54
commit bbcdfe5
Show file tree

Hide file tree

Showing 65 changed files with 153 additions and 134 deletions.
diff --git a/.github/workflows/package-ci.yml b/.github/workflows/package-ci.yml
@@ -0,0 +1,39 @@
+name: Build Package for CI
+
+on:
+  push:
+    branches: 
+      - "main"
+      - "develop"
+    paths-ignore:
+      - "**.md"
+  pull_request:
+    branches: 
+      - "main"
+      - "develop"
+
+env:
+  BUILD_CONFIGURATION: Release
+  DOTNET_VERSION: 8.0.x
+  CSPROJ_TO_BUILD: MAUIWifiManager.csproj
+jobs:
+  build-sample-ci:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup .NET ${{ env.DOTNET_VERSION }}
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Install .NET MAUI Workload
+      run: dotnet workload install maui
+
+    - name: Restore dependencies
+      run: dotnet restore src\MAUIWifiManager\${{ env.CSPROJ_TO_BUILD }}
+
+    - name: Build Package ${{ env.CSPROJ_TO_BUILD }}
+      run: dotnet build src\MAUIWifiManager\${{ env.CSPROJ_TO_BUILD }} -c ${{ env.BUILD_CONFIGURATION }}
diff --git a/.github/workflows/release-nuget.yml b/.github/workflows/release-nuget.yml
@@ -0,0 +1,36 @@
+name: Create a (Pre)release on NuGet
+
+on:
+  push:
+    tags:
+    - "v[0-9]+.[0-9]+.[0-9]+"
+    - "v[0-9]+.[0-9]+.[0-9]+-preview[0-9]+"
+
+jobs:
+  release-nuget:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Verify commit exists in origin/main
+        run: |
+          git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
+          git branch --remote --contains | grep origin/main
+
+      - name: Get version information from tag
+        id: get_version
+        run: |
+          $version="${{github.ref_name}}".TrimStart("v")
+          "version-without-v=$version" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+
+      - name: Install .NET MAUI Workload
+        run: dotnet workload install maui
+
+      - name: Pack
+        run: dotnet pack src\MAUIWifiManager\MAUIWifiManager.csproj -c Release -p:PackageVersion=${{ steps.get_version.outputs.version-without-v }}
+
+      - name: Push
+        run: dotnet nuget push src\MAUIWifiManager\bin\Release\MAUIWifiManager.${{ steps.get_version.outputs.version-without-v }}.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.NUGET_API_KEY }}
diff --git a/.github/workflows/sample-ci.yml b/.github/workflows/sample-ci.yml
@@ -0,0 +1,39 @@
+name: Build Sample for CI
+
+on:
+  push:
+    branches: 
+      - "main"
+      - "develop"
+    paths-ignore:
+      - "**.md"
+  pull_request:
+    branches: 
+      - "main"
+      - "develop"
+
+env:
+  BUILD_CONFIGURATION: Release
+  DOTNET_VERSION: 8.0.x
+  CSPROJ_TO_BUILD: DemoApp.csproj
+jobs:
+  build-sample-ci:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Setup .NET ${{ env.DOTNET_VERSION }}
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: ${{ env.DOTNET_VERSION }}
+
+    - name: Install .NET MAUI Workload
+      run: dotnet workload install maui
+
+    - name: Restore dependencies
+      run: dotnet restore samples\${{ env.CSPROJ_TO_BUILD }}
+
+    - name: Build Demo App ${{ env.CSPROJ_TO_BUILD }}
+      run: dotnet build samples\${{ env.CSPROJ_TO_BUILD }} -c ${{ env.BUILD_CONFIGURATION }} -f:net8.0-android
diff --git a/DemoApp/DemoApp - Backup.csproj b/DemoApp/DemoApp - Backup.csproj
diff --git a/MauiWifiManager.sln b/MauiWifiManager.sln
diff --git a/DemoApp/App.xaml → samples/App.xaml b/DemoApp/App.xaml → samples/App.xaml
diff --git a/DemoApp/App.xaml.cs → samples/App.xaml.cs b/DemoApp/App.xaml.cs → samples/App.xaml.cs
diff --git a/DemoApp/AppShell.xaml → samples/AppShell.xaml b/DemoApp/AppShell.xaml → samples/AppShell.xaml
diff --git a/DemoApp/AppShell.xaml.cs → samples/AppShell.xaml.cs b/DemoApp/AppShell.xaml.cs → samples/AppShell.xaml.cs
diff --git a/DemoApp/ConnectWifi.xaml → samples/ConnectWifi.xaml b/DemoApp/ConnectWifi.xaml → samples/ConnectWifi.xaml
diff --git a/DemoApp/ConnectWifi.xaml.cs → samples/ConnectWifi.xaml.cs b/DemoApp/ConnectWifi.xaml.cs → samples/ConnectWifi.xaml.cs
diff --git a/DemoApp/DemoApp.csproj → samples/DemoApp.csproj b/DemoApp/DemoApp.csproj → samples/DemoApp.csproj
@@ -60,11 +60,10 @@
 		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.90" />
 		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.90" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-		<!--<PackageReference Include="WifiManager.Maui" Version="1.0.2" />-->
 	</ItemGroup>
 
-	<ItemGroup>
-	  <ProjectReference Include="..\MAUIWifiManager\MauiWifiManager.csproj" />
+	<ItemGroup>	  
+	    <ProjectReference Include="..\src\MAUIWifiManager\MauiWifiManager.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/samples/DemoApp.sln b/samples/DemoApp.sln
@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35122.118
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DemoApp", "DemoApp.csproj", "{8F2F33EC-3233-42FF-852C-14D7285F29FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiWifiManager", "..\src\MAUIWifiManager\MauiWifiManager.csproj", "{FF62D77B-5094-472E-878B-385723BFB4B4}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F2F33EC-3233-42FF-852C-14D7285F29FC}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{FF62D77B-5094-472E-878B-385723BFB4B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF62D77B-5094-472E-878B-385723BFB4B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF62D77B-5094-472E-878B-385723BFB4B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF62D77B-5094-472E-878B-385723BFB4B4}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {96135521-CFD4-443F-BC70-4E27005355CE}
+	EndGlobalSection
+EndGlobal
diff --git a/DemoApp/DisconnectWifi.xaml → samples/DisconnectWifi.xaml b/DemoApp/DisconnectWifi.xaml → samples/DisconnectWifi.xaml
diff --git a/DemoApp/DisconnectWifi.xaml.cs → samples/DisconnectWifi.xaml.cs b/DemoApp/DisconnectWifi.xaml.cs → samples/DisconnectWifi.xaml.cs
diff --git a/DemoApp/MainPage.xaml → samples/MainPage.xaml b/DemoApp/MainPage.xaml → samples/MainPage.xaml
diff --git a/DemoApp/MainPage.xaml.cs → samples/MainPage.xaml.cs b/DemoApp/MainPage.xaml.cs → samples/MainPage.xaml.cs
diff --git a/DemoApp/MauiProgram.cs → samples/MauiProgram.cs b/DemoApp/MauiProgram.cs → samples/MauiProgram.cs
diff --git a/DemoApp/NetworkData.cs → samples/NetworkData.cs b/DemoApp/NetworkData.cs → samples/NetworkData.cs
diff --git a/DemoApp/NetworkInfo.xaml → samples/NetworkInfo.xaml b/DemoApp/NetworkInfo.xaml → samples/NetworkInfo.xaml
diff --git a/DemoApp/NetworkInfo.xaml.cs → samples/NetworkInfo.xaml.cs b/DemoApp/NetworkInfo.xaml.cs → samples/NetworkInfo.xaml.cs
diff --git a/...App/Platforms/Android/AndroidManifest.xml → ...les/Platforms/Android/AndroidManifest.xml b/...App/Platforms/Android/AndroidManifest.xml → ...les/Platforms/Android/AndroidManifest.xml
diff --git a/DemoApp/Platforms/Android/MainActivity.cs → samples/Platforms/Android/MainActivity.cs b/DemoApp/Platforms/Android/MainActivity.cs → samples/Platforms/Android/MainActivity.cs
diff --git a/DemoApp/Platforms/Android/MainApplication.cs → samples/Platforms/Android/MainApplication.cs b/DemoApp/Platforms/Android/MainApplication.cs → samples/Platforms/Android/MainApplication.cs
diff --git a/...forms/Android/Resources/values/colors.xml → ...forms/Android/Resources/values/colors.xml b/...forms/Android/Resources/values/colors.xml → ...forms/Android/Resources/values/colors.xml
diff --git a/.../Platforms/Android/Services/GpsService.cs → .../Platforms/Android/Services/GpsService.cs b/.../Platforms/Android/Services/GpsService.cs → .../Platforms/Android/Services/GpsService.cs
diff --git a/DemoApp/Platforms/MacCatalyst/AppDelegate.cs → samples/Platforms/MacCatalyst/AppDelegate.cs b/DemoApp/Platforms/MacCatalyst/AppDelegate.cs → samples/Platforms/MacCatalyst/AppDelegate.cs
diff --git a/.../Platforms/MacCatalyst/Entitlements.plist → .../Platforms/MacCatalyst/Entitlements.plist b/.../Platforms/MacCatalyst/Entitlements.plist → .../Platforms/MacCatalyst/Entitlements.plist
diff --git a/DemoApp/Platforms/MacCatalyst/Info.plist → samples/Platforms/MacCatalyst/Info.plist b/DemoApp/Platforms/MacCatalyst/Info.plist → samples/Platforms/MacCatalyst/Info.plist
diff --git a/DemoApp/Platforms/MacCatalyst/Program.cs → samples/Platforms/MacCatalyst/Program.cs b/DemoApp/Platforms/MacCatalyst/Program.cs → samples/Platforms/MacCatalyst/Program.cs
diff --git a/...tforms/MacCatalyst/Services/GpsService.cs → ...tforms/MacCatalyst/Services/GpsService.cs b/...tforms/MacCatalyst/Services/GpsService.cs → ...tforms/MacCatalyst/Services/GpsService.cs
diff --git a/DemoApp/Platforms/Tizen/Main.cs → samples/Platforms/Tizen/Main.cs b/DemoApp/Platforms/Tizen/Main.cs → samples/Platforms/Tizen/Main.cs
diff --git a/DemoApp/Platforms/Tizen/tizen-manifest.xml → samples/Platforms/Tizen/tizen-manifest.xml b/DemoApp/Platforms/Tizen/tizen-manifest.xml → samples/Platforms/Tizen/tizen-manifest.xml
diff --git a/DemoApp/Platforms/Windows/App.xaml → samples/Platforms/Windows/App.xaml b/DemoApp/Platforms/Windows/App.xaml → samples/Platforms/Windows/App.xaml
diff --git a/DemoApp/Platforms/Windows/App.xaml.cs → samples/Platforms/Windows/App.xaml.cs b/DemoApp/Platforms/Windows/App.xaml.cs → samples/Platforms/Windows/App.xaml.cs
diff --git a/...pp/Platforms/Windows/Package.appxmanifest → ...es/Platforms/Windows/Package.appxmanifest b/...pp/Platforms/Windows/Package.appxmanifest → ...es/Platforms/Windows/Package.appxmanifest
diff --git a/.../Platforms/Windows/Services/GpsService.cs → .../Platforms/Windows/Services/GpsService.cs b/.../Platforms/Windows/Services/GpsService.cs → .../Platforms/Windows/Services/GpsService.cs
diff --git a/DemoApp/Platforms/Windows/app.manifest → samples/Platforms/Windows/app.manifest b/DemoApp/Platforms/Windows/app.manifest → samples/Platforms/Windows/app.manifest
diff --git a/DemoApp/Platforms/iOS/AppDelegate.cs → samples/Platforms/iOS/AppDelegate.cs b/DemoApp/Platforms/iOS/AppDelegate.cs → samples/Platforms/iOS/AppDelegate.cs
diff --git a/DemoApp/Platforms/iOS/Entitlements.plist → samples/Platforms/iOS/Entitlements.plist b/DemoApp/Platforms/iOS/Entitlements.plist → samples/Platforms/iOS/Entitlements.plist
diff --git a/DemoApp/Platforms/iOS/Info.plist → samples/Platforms/iOS/Info.plist b/DemoApp/Platforms/iOS/Info.plist → samples/Platforms/iOS/Info.plist
diff --git a/DemoApp/Platforms/iOS/Program.cs → samples/Platforms/iOS/Program.cs b/DemoApp/Platforms/iOS/Program.cs → samples/Platforms/iOS/Program.cs
diff --git a/DemoApp/Platforms/iOS/Services/GpsService.cs → samples/Platforms/iOS/Services/GpsService.cs b/DemoApp/Platforms/iOS/Services/GpsService.cs → samples/Platforms/iOS/Services/GpsService.cs
diff --git a/DemoApp/Properties/launchSettings.json → samples/Properties/launchSettings.json b/DemoApp/Properties/launchSettings.json → samples/Properties/launchSettings.json
diff --git a/DemoApp/Resources/AppIcon/appicon.svg → samples/Resources/AppIcon/appicon.svg b/DemoApp/Resources/AppIcon/appicon.svg → samples/Resources/AppIcon/appicon.svg
diff --git a/DemoApp/Resources/AppIcon/appiconfg.svg → samples/Resources/AppIcon/appiconfg.svg b/DemoApp/Resources/AppIcon/appiconfg.svg → samples/Resources/AppIcon/appiconfg.svg
diff --git a/DemoApp/Resources/Fonts/OpenSans-Regular.ttf → samples/Resources/Fonts/OpenSans-Regular.ttf b/DemoApp/Resources/Fonts/OpenSans-Regular.ttf → samples/Resources/Fonts/OpenSans-Regular.ttf
diff --git a/...App/Resources/Fonts/OpenSans-Semibold.ttf → ...les/Resources/Fonts/OpenSans-Semibold.ttf b/...App/Resources/Fonts/OpenSans-Semibold.ttf → ...les/Resources/Fonts/OpenSans-Semibold.ttf
diff --git a/DemoApp/Resources/Images/dotnet_bot.png → samples/Resources/Images/dotnet_bot.png b/DemoApp/Resources/Images/dotnet_bot.png → samples/Resources/Images/dotnet_bot.png
diff --git a/DemoApp/Resources/Raw/AboutAssets.txt → samples/Resources/Raw/AboutAssets.txt b/DemoApp/Resources/Raw/AboutAssets.txt → samples/Resources/Raw/AboutAssets.txt
diff --git a/DemoApp/Resources/Splash/splash.svg → samples/Resources/Splash/splash.svg b/DemoApp/Resources/Splash/splash.svg → samples/Resources/Splash/splash.svg
diff --git a/DemoApp/Resources/Styles/Colors.xaml → samples/Resources/Styles/Colors.xaml b/DemoApp/Resources/Styles/Colors.xaml → samples/Resources/Styles/Colors.xaml
diff --git a/DemoApp/Resources/Styles/Styles.xaml → samples/Resources/Styles/Styles.xaml b/DemoApp/Resources/Styles/Styles.xaml → samples/Resources/Styles/Styles.xaml
diff --git a/DemoApp/ScanListPage.xaml → samples/ScanListPage.xaml b/DemoApp/ScanListPage.xaml → samples/ScanListPage.xaml
diff --git a/DemoApp/ScanListPage.xaml.cs → samples/ScanListPage.xaml.cs b/DemoApp/ScanListPage.xaml.cs → samples/ScanListPage.xaml.cs
diff --git a/DemoApp/Services/IGpsService.cs → samples/Services/IGpsService.cs b/DemoApp/Services/IGpsService.cs → samples/Services/IGpsService.cs
diff --git a/MAUIWifiManager/CrossWifiManager.shared.cs → ...AUIWifiManager/CrossWifiManager.shared.cs b/MAUIWifiManager/CrossWifiManager.shared.cs → ...AUIWifiManager/CrossWifiManager.shared.cs
diff --git a/...WifiManager/IWifiNetworkService.shared.cs → ...WifiManager/IWifiNetworkService.shared.cs b/...WifiManager/IWifiNetworkService.shared.cs → ...WifiManager/IWifiNetworkService.shared.cs
diff --git a/MAUIWifiManager/MauiWifiManager.csproj → src/MAUIWifiManager/MauiWifiManager.csproj b/MAUIWifiManager/MauiWifiManager.csproj → src/MAUIWifiManager/MauiWifiManager.csproj
@@ -14,10 +14,10 @@
 		<PackageId>WifiManager.Maui</PackageId>
 
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
-		<AssemblyVersion>1.0.3</AssemblyVersion>
-		<AssemblyFileVersion>1.0.3</AssemblyFileVersion>
-		<Version>1.0.3</Version>
-		<PackageVersion>1.0.3</PackageVersion>
+		<AssemblyVersion>1.0.4</AssemblyVersion>
+		<AssemblyFileVersion>1.0.4</AssemblyFileVersion>
+		<Version>1.0.4</Version>
+		<PackageVersion>1.0.4</PackageVersion>
 		<PackOnBuild>true</PackOnBuild>
 		<NeutralLanguage>en</NeutralLanguage>
 		<DefineConstants>$(DefineConstants);</DefineConstants>

diff --git a/MAUIWifiManager/NetworkData.cs → src/MAUIWifiManager/NetworkData.cs b/MAUIWifiManager/NetworkData.cs → src/MAUIWifiManager/NetworkData.cs
diff --git a/...WifiManager/WifiNetworkService.android.cs → ...WifiManager/WifiNetworkService.android.cs b/...WifiManager/WifiNetworkService.android.cs → ...WifiManager/WifiNetworkService.android.cs
diff --git a/MAUIWifiManager/WifiNetworkService.apple.cs → ...UIWifiManager/WifiNetworkService.apple.cs b/MAUIWifiManager/WifiNetworkService.apple.cs → ...UIWifiManager/WifiNetworkService.apple.cs
diff --git a/MAUIWifiManager/WifiNetworkService.uwp.cs → ...MAUIWifiManager/WifiNetworkService.uwp.cs b/MAUIWifiManager/WifiNetworkService.uwp.cs → ...MAUIWifiManager/WifiNetworkService.uwp.cs
diff --git a/MAUIWifiManager/docs/README.md → src/MAUIWifiManager/docs/README.md b/MAUIWifiManager/docs/README.md → src/MAUIWifiManager/docs/README.md
diff --git a/MAUIWifiManager/images/icon.png → src/MAUIWifiManager/images/icon.png b/MAUIWifiManager/images/icon.png → src/MAUIWifiManager/images/icon.png