Merge pull request #30 from egvijayanand/working

Solution updated to .NET 8 RC2
egvijayanand · Oct 13, 2023 · 25a6918 · 25a6918
2 parents 89e577c + 574f3e6
commit 25a6918
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ on:
 
 # Allows you to run this workflow manually from the Actions tab
 env:
-  DOTNET_VERSION: '8.0.100-rc.1.23463.5'
+  DOTNET_VERSION: '8.0.100-rc.2.23502.2'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,7 +9,7 @@ on:
 
 # Allows you to run this workflow manually from the Actions tab
 env:
-  DOTNET_VERSION: '8.0.100-rc.1.23463.5'
+  DOTNET_VERSION: '8.0.100-rc.2.23502.2'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

diff --git a/global.json b/global.json
@@ -3,4 +3,4 @@
     "rollForward": "latestMinor",
     "version": "8.0.100-preview.1.23115.2"
   }
-}
+}
diff --git a/src/BlazorApp/BlazorApp.Server/BlazorApp.Server.csproj b/src/BlazorApp/BlazorApp.Server/BlazorApp.Server.csproj
@@ -10,7 +10,7 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
-		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-rc.1" />
+		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-*" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/BlazorApp/BlazorApp.Wasm/BlazorApp.Wasm.csproj b/src/BlazorApp/BlazorApp.Wasm/BlazorApp.Wasm.csproj
@@ -13,9 +13,9 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-rc.1.*" PrivateAssets="all" />
-		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-rc.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0-*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0-*" PrivateAssets="all" />
+		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-*" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/BlazorApp/BlazorApp.WinForms/BlazorApp.WinForms.csproj b/src/BlazorApp/BlazorApp.WinForms/BlazorApp.WinForms.csproj
@@ -72,14 +72,10 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-		<!--<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1722.45" />-->
-		<!--<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1661.34" />-->
-		<!--<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1370.28" />-->
-		<!--<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />-->
-		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-rc.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.0-*" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-*" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
+		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-*" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\WeeklyXamarin.Core\WeeklyXamarin.Core.csproj" />

diff --git a/src/BlazorApp/BlazorApp.Wpf/BlazorApp.Wpf.csproj b/src/BlazorApp/BlazorApp.Wpf/BlazorApp.Wpf.csproj
@@ -10,9 +10,9 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-rc.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Wpf" Version="8.0.0-*" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0-*" />
+		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-*" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\WeeklyXamarin.Core\WeeklyXamarin.Core.csproj" />

diff --git a/src/BlazorApp/BlazorApp/BlazorApp.csproj b/src/BlazorApp/BlazorApp/BlazorApp.csproj
@@ -69,11 +69,11 @@
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
 		<PackageReference Include="CommunityToolkit.Maui" Version="5.3.*" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.*" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-rc.1.*" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.1.*" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-*" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-*" />
 		<PackageReference Include="PInvoke.User32" Version="0.7.124" />
 		<PackageReference Include="VijayAnand.FontAwesome" Version="2.3.0" />
-		<PackageReference Include="VijayAnand.MauiToolkit" Version="3.0.0-rc.1" />
+		<PackageReference Include="VijayAnand.MauiToolkit" Version="3.0.0-* />
 	</ItemGroup>
 
 	<!--<PropertyGroup>

diff --git a/src/BlazorApp/WeeklyXamarin.Core/WeeklyXamarin.Core.csproj b/src/BlazorApp/WeeklyXamarin.Core/WeeklyXamarin.Core.csproj
@@ -23,11 +23,11 @@
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.2.0" />
 		<PackageReference Include="Blazored.Modal" Version="6.0.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-rc.1.*" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0-*" />
 		<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-rc.1.*" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0-*" />
 		<!--<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />-->
-		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-rc.1" />
+		<PackageReference Include="VijayAnand.MauiToolkit.Core" Version="3.0.0-*" />
 	</ItemGroup>
 
 	<ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,4 +3,4 @@ @@
         "rollForward": "latestMinor",
         "version": "8.0.100-preview.1.23115.2"
       }
-    }
+    }