diff --git a/samples/dymaptic.GeoBlazor.Core.Sample.Maui/dymaptic.GeoBlazor.Core.Sample.Maui.csproj b/samples/dymaptic.GeoBlazor.Core.Sample.Maui/dymaptic.GeoBlazor.Core.Sample.Maui.csproj index a51b12a1..8810c3c6 100644 --- a/samples/dymaptic.GeoBlazor.Core.Sample.Maui/dymaptic.GeoBlazor.Core.Sample.Maui.csproj +++ b/samples/dymaptic.GeoBlazor.Core.Sample.Maui/dymaptic.GeoBlazor.Core.Sample.Maui.csproj @@ -1,10 +1,18 @@  - net8.0-android;net8.0-ios;net8.0-maccatalyst - $(TargetFrameworks);net8.0-windows10.0.19041.0 - - + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + + + + Exe dymaptic.GeoBlazor.Core.Sample.Maui true diff --git a/src/dymaptic.GeoBlazor.Core/package-lock.json b/src/dymaptic.GeoBlazor.Core/package-lock.json index d8ae3c27..e6e34601 100644 --- a/src/dymaptic.GeoBlazor.Core/package-lock.json +++ b/src/dymaptic.GeoBlazor.Core/package-lock.json @@ -8,7 +8,7 @@ "name": "dymaptic.GeoBlazor.Core", "license": "ISC", "dependencies": { - "@arcgis/core": "4.28", + "@arcgis/core": "4.28.10", "esbuild": "0.19.5", "protobufjs": "7.2.5", "protobufjs-cli": "1.1.2" @@ -18,9 +18,9 @@ } }, "node_modules/@arcgis/core": { - "version": "4.28.0", - "resolved": "https://registry.npmjs.org/@arcgis/core/-/core-4.28.0.tgz", - "integrity": "sha512-YTihhrezWGc1ci5bPS/bd5ZUHDnbaCpcwEGXmdk7h9xPmLtC3JHeIkVn0G+EJiyWkWVew9vsKL/864ToMLb/Sw==", + "version": "4.28.10", + "resolved": "https://registry.npmjs.org/@arcgis/core/-/core-4.28.10.tgz", + "integrity": "sha512-FKvicMVDwFuKX8JKLqAfukzQU2F3AG7s3tDigTcIC4ApGRbj7Nc/F9dRfPZo+aY1Vl7Sa1FjYlo6tfV93LJ2Eg==", "dependencies": { "@esri/arcgis-html-sanitizer": "~3.0.1", "@esri/calcite-colors": "~6.1.0", @@ -1412,9 +1412,9 @@ }, "dependencies": { "@arcgis/core": { - "version": "4.28.0", - "resolved": "https://registry.npmjs.org/@arcgis/core/-/core-4.28.0.tgz", - "integrity": "sha512-YTihhrezWGc1ci5bPS/bd5ZUHDnbaCpcwEGXmdk7h9xPmLtC3JHeIkVn0G+EJiyWkWVew9vsKL/864ToMLb/Sw==", + "version": "4.28.10", + "resolved": "https://registry.npmjs.org/@arcgis/core/-/core-4.28.10.tgz", + "integrity": "sha512-FKvicMVDwFuKX8JKLqAfukzQU2F3AG7s3tDigTcIC4ApGRbj7Nc/F9dRfPZo+aY1Vl7Sa1FjYlo6tfV93LJ2Eg==", "requires": { "@esri/arcgis-html-sanitizer": "~3.0.1", "@esri/calcite-colors": "~6.1.0", diff --git a/src/dymaptic.GeoBlazor.Core/package.json b/src/dymaptic.GeoBlazor.Core/package.json index 224b0aee..3f7a0655 100644 --- a/src/dymaptic.GeoBlazor.Core/package.json +++ b/src/dymaptic.GeoBlazor.Core/package.json @@ -11,7 +11,7 @@ "author": "Tim Purdum", "license": "ISC", "dependencies": { - "@arcgis/core": "4.28", + "@arcgis/core": "4.28.10", "esbuild": "0.19.5", "protobufjs": "7.2.5", "protobufjs-cli": "1.1.2" diff --git a/templates/README.md b/templates/README.md index bc9560a3..32e69554 100644 --- a/templates/README.md +++ b/templates/README.md @@ -11,15 +11,9 @@ Maui Hybrid Blazor App Web App (Client/Server hybrid Blazor) -to install this template package from this folder, run: +to install this template package run: ``` -dotnet new install .\ -``` -(MacOS\Linux users should reverse the slash) - -to install from nuget package, run: -``` -dotnet new install ..PATH_TO_NUGET_SOURCE\GeoBlazor.Templates.1.0.0.nupkg +dotnet new install GeoBlazor.Templates ``` to create a new GeoBlazor Server project run: diff --git a/templates/content/GeoBlazor.Template.Maui/GeoBlazor.Template.Maui.csproj b/templates/content/GeoBlazor.Template.Maui/GeoBlazor.Template.Maui.csproj index eea42815..5f04a5cb 100644 --- a/templates/content/GeoBlazor.Template.Maui/GeoBlazor.Template.Maui.csproj +++ b/templates/content/GeoBlazor.Template.Maui/GeoBlazor.Template.Maui.csproj @@ -1,80 +1,93 @@ - - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 - - - Exe - GeoBlazor.Template.Maui - true - true - enable - false - - - GeoBlazor.Template.Maui - - - com.companyname.geoblazor.template.maui - 044B2D00-113D-451C-9538-163BCAFC33E2 - - - 1.0 - 1 - - 14.2 - 14.0 - 24.0 - 10.0.17763.0 - 10.0.17763.0 - 6.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - PreserveNewest - - - - - - - + + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + + + + + Exe + GeoBlazor.Template.Maui + true + true + enable + false + + + GeoBlazor.Template.Maui + + + com.companyname.geoblazor.template.maui + 044B2D00-113D-451C-9538-163BCAFC33E2 + + + 1.0 + 1 + + 14.2 + 14.0 + 24.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + PreserveNewest + + + + + + + + + + + + diff --git a/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp.Client/wwwroot/appsettings.json b/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp.Client/wwwroot/appsettings.json index 0fc3e007..41f52c56 100644 --- a/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp.Client/wwwroot/appsettings.json +++ b/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp.Client/wwwroot/appsettings.json @@ -5,5 +5,5 @@ "Microsoft.AspNetCore": "Warning" } }, - "ArcGISApiKey": "AAPKf80573b33855415a91e89fe2936e735dXZ1lSzS1r45kvzIhSdv008E1bizdGdoiXHb401mAPt7qT35wxf4DH22CbOPxsxHJ" + "ArcGISApiKey": "EnterArcGISApiKey" } diff --git a/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp/appsettings.json b/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp/appsettings.json index fc5cc112..6e3939ec 100644 --- a/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp/appsettings.json +++ b/templates/content/GeoBlazor.Template.WebApp/GeoBlazor.Template.WebApp/appsettings.json @@ -6,5 +6,5 @@ } }, "AllowedHosts": "*", - "ArcGISApiKey": "AAPKf80573b33855415a91e89fe2936e735dXZ1lSzS1r45kvzIhSdv008E1bizdGdoiXHb401mAPt7qT35wxf4DH22CbOPxsxHJ" + "ArcGISApiKey": "EnterArcGISApiKey" } diff --git a/templates/content/GeoBlazor.Template.WebAssembly/GeoBlazor.Template.WebAssembly.csproj b/templates/content/GeoBlazor.Template.WebAssembly/GeoBlazor.Template.WebAssembly.csproj index 3dde7da2..3d55cea0 100644 --- a/templates/content/GeoBlazor.Template.WebAssembly/GeoBlazor.Template.WebAssembly.csproj +++ b/templates/content/GeoBlazor.Template.WebAssembly/GeoBlazor.Template.WebAssembly.csproj @@ -1,15 +1,15 @@ - net7.0 + net8.0 enable enable - - + +