From c5644bd188cae6cdee3ccf8bbed8d2f83c4e6c50 Mon Sep 17 00:00:00 2001 From: Vijay Anand E G <81947404+egvijayanand@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:30:09 +0530 Subject: [PATCH] Samples updated for .NET MAUI 9 Stable channel release. --- global.json | 2 +- .../EmbeddedAndroid/Directory.Packages.props | 6 ++ src/NET_9/EmbeddedAndroid/EmbeddedAndroid.sln | 5 ++ .../EmbeddedAndroid/EmbeddedAndroid.slnx | 3 + .../EmbeddedWindows/Directory.Packages.props | 6 ++ src/NET_9/EmbeddedWindows/EmbeddedWindows.sln | 5 ++ .../EmbeddedWindows/EmbeddedWindows.slnx | 10 ++++ .../EmbeddediOS/Directory.Packages.props | 6 ++ src/NET_9/EmbeddediOS/EmbeddediOS.sln | 5 ++ src/NET_9/EmbeddediOS/EmbeddediOS.slnx | 3 + .../HybridWebViewApp/Directory.Packages.props | 6 ++ .../HybridWebViewApp/HybridWebViewApp.csproj | 2 +- .../HybridWebViewApp/HybridWebViewApp.sln | 5 ++ .../HybridWebViewApp/HybridWebViewApp.slnx | 3 + .../Resources/Raw/wwwroot/scripts/hwv.js | 56 ++++++++++++++++--- src/NET_9/MapsApp/Directory.Packages.props | 6 ++ src/NET_9/MapsApp/MapsApp.sln | 5 ++ src/NET_9/MapsApp/MapsApp.slnx | 13 +++++ .../WinUIBlazor/Directory.Packages.props | 6 ++ .../WinUIBlazor.MauiLib.csproj | 4 +- .../WinUIBlazor.RazorLib.csproj | 2 +- src/NET_9/WinUIBlazor/WinUIBlazor.sln | 39 +++++++++++++ src/NET_9/WinUIBlazor/WinUIBlazor.slnx | 5 +- src/NET_9/global.json | 2 +- 24 files changed, 191 insertions(+), 14 deletions(-) create mode 100644 src/NET_9/EmbeddedAndroid/Directory.Packages.props create mode 100644 src/NET_9/EmbeddedWindows/Directory.Packages.props create mode 100644 src/NET_9/EmbeddedWindows/EmbeddedWindows.slnx create mode 100644 src/NET_9/EmbeddediOS/Directory.Packages.props create mode 100644 src/NET_9/HybridWebViewApp/Directory.Packages.props create mode 100644 src/NET_9/MapsApp/Directory.Packages.props create mode 100644 src/NET_9/MapsApp/MapsApp.slnx create mode 100644 src/NET_9/WinUIBlazor/Directory.Packages.props create mode 100644 src/NET_9/WinUIBlazor/WinUIBlazor.sln diff --git a/global.json b/global.json index 43663cb..b78db0b 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "allowPrerelease": true, "rollForward": "latestMinor", - "version": "8.0.100" + "version": "9.0.100" } } diff --git a/src/NET_9/EmbeddedAndroid/Directory.Packages.props b/src/NET_9/EmbeddedAndroid/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/EmbeddedAndroid/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.sln b/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.sln index fe64afc..9c211ce 100644 --- a/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.sln +++ b/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedAndroid", "EmbeddedAndroid.csproj", "{6080BD5C-A536-4175-A64D-78FFC4642A41}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.slnx b/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.slnx index 8c79a97..1fa2a18 100644 --- a/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.slnx +++ b/src/NET_9/EmbeddedAndroid/EmbeddedAndroid.slnx @@ -1,4 +1,7 @@ + + + diff --git a/src/NET_9/EmbeddedWindows/Directory.Packages.props b/src/NET_9/EmbeddedWindows/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/EmbeddedWindows/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/EmbeddedWindows/EmbeddedWindows.sln b/src/NET_9/EmbeddedWindows/EmbeddedWindows.sln index cc6844d..4613757 100644 --- a/src/NET_9/EmbeddedWindows/EmbeddedWindows.sln +++ b/src/NET_9/EmbeddedWindows/EmbeddedWindows.sln @@ -7,6 +7,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedWindows", "Embedded EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MauiLib", "MauiLib\MauiLib.csproj", "{E93EB175-0FD3-4BFD-B81A-CDAF33998932}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/NET_9/EmbeddedWindows/EmbeddedWindows.slnx b/src/NET_9/EmbeddedWindows/EmbeddedWindows.slnx new file mode 100644 index 0000000..b132fac --- /dev/null +++ b/src/NET_9/EmbeddedWindows/EmbeddedWindows.slnx @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/NET_9/EmbeddediOS/Directory.Packages.props b/src/NET_9/EmbeddediOS/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/EmbeddediOS/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/EmbeddediOS/EmbeddediOS.sln b/src/NET_9/EmbeddediOS/EmbeddediOS.sln index 484065f..4faece4 100644 --- a/src/NET_9/EmbeddediOS/EmbeddediOS.sln +++ b/src/NET_9/EmbeddediOS/EmbeddediOS.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddediOS", "EmbeddediOS.csproj", "{DEB5C69A-CC84-491E-9E3D-72E222628EB2}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/NET_9/EmbeddediOS/EmbeddediOS.slnx b/src/NET_9/EmbeddediOS/EmbeddediOS.slnx index 5060b9a..aad3069 100644 --- a/src/NET_9/EmbeddediOS/EmbeddediOS.slnx +++ b/src/NET_9/EmbeddediOS/EmbeddediOS.slnx @@ -1,4 +1,7 @@ + + + diff --git a/src/NET_9/HybridWebViewApp/Directory.Packages.props b/src/NET_9/HybridWebViewApp/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/HybridWebViewApp/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/HybridWebViewApp/HybridWebViewApp.csproj b/src/NET_9/HybridWebViewApp/HybridWebViewApp.csproj index 2cfcfb0..345f08a 100644 --- a/src/NET_9/HybridWebViewApp/HybridWebViewApp.csproj +++ b/src/NET_9/HybridWebViewApp/HybridWebViewApp.csproj @@ -60,7 +60,7 @@ - + diff --git a/src/NET_9/HybridWebViewApp/HybridWebViewApp.sln b/src/NET_9/HybridWebViewApp/HybridWebViewApp.sln index ea40cdd..a38cbf7 100644 --- a/src/NET_9/HybridWebViewApp/HybridWebViewApp.sln +++ b/src/NET_9/HybridWebViewApp/HybridWebViewApp.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 Project("{371A51A3-7E6B-415E-A4CD-ADAC03BCC115}") = "HybridWebViewApp", "HybridWebViewApp.csproj", "{A46627CB-85E6-4A7B-BAA0-A785D0B73BC1}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/NET_9/HybridWebViewApp/HybridWebViewApp.slnx b/src/NET_9/HybridWebViewApp/HybridWebViewApp.slnx index 5596a60..5974039 100644 --- a/src/NET_9/HybridWebViewApp/HybridWebViewApp.slnx +++ b/src/NET_9/HybridWebViewApp/HybridWebViewApp.slnx @@ -1,4 +1,7 @@ + + + diff --git a/src/NET_9/HybridWebViewApp/Resources/Raw/wwwroot/scripts/hwv.js b/src/NET_9/HybridWebViewApp/Resources/Raw/wwwroot/scripts/hwv.js index 337c388..d4885bd 100644 --- a/src/NET_9/HybridWebViewApp/Resources/Raw/wwwroot/scripts/hwv.js +++ b/src/NET_9/HybridWebViewApp/Resources/Raw/wwwroot/scripts/hwv.js @@ -1,5 +1,5 @@ window.HybridWebView = { - "Init": function () { + "Init": function Init() { function DispatchHybridWebViewMessage(message) { const event = new CustomEvent("HybridWebViewMessageReceived", { detail: { message: message } }); window.dispatchEvent(event); @@ -27,11 +27,53 @@ } }, - "SendRawMessage": function (message) { - window.HybridWebView.__SendMessageInternal('RawMessage', message); + "SendRawMessage": function SendRawMessage(message) { + window.HybridWebView.__SendMessageInternal('__RawMessage', message); }, - "__SendMessageInternal": function (type, message) { + "InvokeDotNet": async function InvokeDotNetAsync(methodName, paramValues) { + const body = { + MethodName: methodName + }; + + if (typeof paramValues !== 'undefined') { + if (!Array.isArray(paramValues)) { + paramValues = [paramValues]; + } + + for (var i = 0; i < paramValues.length; i++) { + paramValues[i] = JSON.stringify(paramValues[i]); + } + + if (paramValues.length > 0) { + body.ParamValues = paramValues; + } + } + + const message = JSON.stringify(body); + + var requestUrl = `${window.location.origin}/__hwvInvokeDotNet?data=${encodeURIComponent(message)}`; + + const rawResponse = await fetch(requestUrl, { + method: 'GET', + headers: { + 'Accept': 'application/json' + } + }); + const response = await rawResponse.json(); + + if (response) { + if (response.IsJson) { + return JSON.parse(response.Result); + } + + return response.Result; + } + + return null; + }, + + "__SendMessageInternal": function __SendMessageInternal(type, message) { const messageToSend = type + '|' + message; @@ -49,7 +91,7 @@ } }, - "InvokeMethod": function (taskId, methodName, args) { + "__InvokeJavaScript": function __InvokeJavaScript(taskId, methodName, args) { if (methodName[Symbol.toStringTag] === 'AsyncFunction') { // For async methods, we need to call the method and then trigger the callback when it's done const asyncPromise = methodName(...args); @@ -65,13 +107,13 @@ } }, - "__TriggerAsyncCallback": function (taskId, result) { + "__TriggerAsyncCallback": function __TriggerAsyncCallback(taskId, result) { // Make sure the result is a string if (result && typeof (result) !== 'string') { result = JSON.stringify(result); } - window.HybridWebView.__SendMessageInternal('InvokeMethodCompleted', taskId + '|' + result); + window.HybridWebView.__SendMessageInternal('__InvokeJavaScriptCompleted', taskId + '|' + result); } } diff --git a/src/NET_9/MapsApp/Directory.Packages.props b/src/NET_9/MapsApp/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/MapsApp/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/MapsApp/MapsApp.sln b/src/NET_9/MapsApp/MapsApp.sln index c8d3d40..207507e 100644 --- a/src/NET_9/MapsApp/MapsApp.sln +++ b/src/NET_9/MapsApp/MapsApp.sln @@ -5,6 +5,11 @@ VisualStudioVersion = 17.5.33103.201 MinimumVisualStudioVersion = 10.0.40219.1 Project("{CC39106E-4594-4901-AEFB-51DE890E7E34}") = "MapsApp", "MapsApp.csproj", "{89D6D593-C99A-4072-8777-D8A241E1BFDD}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|arm64 = Debug|arm64 diff --git a/src/NET_9/MapsApp/MapsApp.slnx b/src/NET_9/MapsApp/MapsApp.slnx new file mode 100644 index 0000000..0a77dbe --- /dev/null +++ b/src/NET_9/MapsApp/MapsApp.slnx @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/NET_9/WinUIBlazor/Directory.Packages.props b/src/NET_9/WinUIBlazor/Directory.Packages.props new file mode 100644 index 0000000..50cc564 --- /dev/null +++ b/src/NET_9/WinUIBlazor/Directory.Packages.props @@ -0,0 +1,6 @@ + + + false + 9.* + + diff --git a/src/NET_9/WinUIBlazor/WinUIBlazor.MauiLib/WinUIBlazor.MauiLib.csproj b/src/NET_9/WinUIBlazor/WinUIBlazor.MauiLib/WinUIBlazor.MauiLib.csproj index aba0529..00b8fb9 100644 --- a/src/NET_9/WinUIBlazor/WinUIBlazor.MauiLib/WinUIBlazor.MauiLib.csproj +++ b/src/NET_9/WinUIBlazor/WinUIBlazor.MauiLib/WinUIBlazor.MauiLib.csproj @@ -16,9 +16,9 @@ - + - + diff --git a/src/NET_9/WinUIBlazor/WinUIBlazor.RazorLib/WinUIBlazor.RazorLib.csproj b/src/NET_9/WinUIBlazor/WinUIBlazor.RazorLib/WinUIBlazor.RazorLib.csproj index 2efecb1..eed9d5c 100644 --- a/src/NET_9/WinUIBlazor/WinUIBlazor.RazorLib/WinUIBlazor.RazorLib.csproj +++ b/src/NET_9/WinUIBlazor/WinUIBlazor.RazorLib/WinUIBlazor.RazorLib.csproj @@ -15,6 +15,6 @@ - + diff --git a/src/NET_9/WinUIBlazor/WinUIBlazor.sln b/src/NET_9/WinUIBlazor/WinUIBlazor.sln new file mode 100644 index 0000000..6b9e4d0 --- /dev/null +++ b/src/NET_9/WinUIBlazor/WinUIBlazor.sln @@ -0,0 +1,39 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUIBlazor", "WinUIBlazor\WinUIBlazor.csproj", "{B4FE125E-4AFF-44EB-A3B7-DC1793D7CBA6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUIBlazor.MauiLib", "WinUIBlazor.MauiLib\WinUIBlazor.MauiLib.csproj", "{71F838CD-A4C9-48E4-ABA9-716FB160CBEB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinUIBlazor.RazorLib", "WinUIBlazor.RazorLib\WinUIBlazor.RazorLib.csproj", "{F427596A-19AA-4AC4-9F24-BCCF206EBBF0}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F427596A-19AA-4AC4-9F24-BCCF206EBBF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F427596A-19AA-4AC4-9F24-BCCF206EBBF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F427596A-19AA-4AC4-9F24-BCCF206EBBF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F427596A-19AA-4AC4-9F24-BCCF206EBBF0}.Release|Any CPU.Build.0 = Release|Any CPU + {71F838CD-A4C9-48E4-ABA9-716FB160CBEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71F838CD-A4C9-48E4-ABA9-716FB160CBEB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71F838CD-A4C9-48E4-ABA9-716FB160CBEB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71F838CD-A4C9-48E4-ABA9-716FB160CBEB}.Release|Any CPU.Build.0 = Release|Any CPU + {B4FE125E-4AFF-44EB-A3B7-DC1793D7CBA6}.Debug|Any CPU.ActiveCfg = Debug|x86 + {B4FE125E-4AFF-44EB-A3B7-DC1793D7CBA6}.Debug|Any CPU.Build.0 = Debug|x86 + {B4FE125E-4AFF-44EB-A3B7-DC1793D7CBA6}.Release|Any CPU.ActiveCfg = Release|x86 + {B4FE125E-4AFF-44EB-A3B7-DC1793D7CBA6}.Release|Any CPU.Build.0 = Release|x86 + EndGlobalSection +EndGlobal diff --git a/src/NET_9/WinUIBlazor/WinUIBlazor.slnx b/src/NET_9/WinUIBlazor/WinUIBlazor.slnx index b7ec7a8..5f650dd 100644 --- a/src/NET_9/WinUIBlazor/WinUIBlazor.slnx +++ b/src/NET_9/WinUIBlazor/WinUIBlazor.slnx @@ -1,4 +1,7 @@ + + + @@ -9,4 +12,4 @@ - \ No newline at end of file + diff --git a/src/NET_9/global.json b/src/NET_9/global.json index f350572..b78db0b 100644 --- a/src/NET_9/global.json +++ b/src/NET_9/global.json @@ -2,6 +2,6 @@ "sdk": { "allowPrerelease": true, "rollForward": "latestMinor", - "version": "9.0.100-preview.1.24101.2" + "version": "9.0.100" } }