Merge pull request #43 from PaoloPia/test-validation

Updated manifest.json for Contoso solution
pnp · Apr 24, 2024 · 6afa647 · 6afa647
2 parents ee2082c + 538e699
commit 6afa647
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/samples/contoso-retail-demo/contoso-retail-demo-spfx/teams/TeamsSPFxApp.zip b/samples/contoso-retail-demo/contoso-retail-demo-spfx/teams/TeamsSPFxApp.zip
diff --git a/samples/contoso-retail-demo/contoso-retail-demo-spfx/teams/manifest.json b/samples/contoso-retail-demo/contoso-retail-demo-spfx/teams/manifest.json
@@ -8,7 +8,7 @@
     "developer": {
         "name": "PiaSys.com",
         "websiteUrl": "https://www.piasys.com/",
-        "privacyUrl": "http://piasys.com/privacy/",
+        "privacyUrl": "https://piasys.com/privacy/",
         "termsOfUseUrl": "https://www.piasys.com/terms-of-use/"
     },
     "icons": {
@@ -60,7 +60,7 @@
         "identity"
     ],
     "validDomains": [
-        "piasysdev.sharepoint.com",
+        "*.sharepoint.com",
         "*.login.microsoftonline.com",
         "*.sharepoint-df.com",
         "spoppe-a.akamaihd.net",

diff --git a/...s/spfx-middleware/spfx-middleware-apis/obj/Debug/net6.0/spfx-middleware-apis.assets.cache b/...s/spfx-middleware/spfx-middleware-apis/obj/Debug/net6.0/spfx-middleware-apis.assets.cache
diff --git a/...spfx-middleware-apis/obj/Debug/net6.0/spfx-middleware-apis.csproj.AssemblyReference.cache b/...spfx-middleware-apis/obj/Debug/net6.0/spfx-middleware-apis.csproj.AssemblyReference.cache
diff --git a/samples/spfx-middleware/spfx-middleware-apis/obj/project.assets.json b/samples/spfx-middleware/spfx-middleware-apis/obj/project.assets.json
@@ -2892,7 +2892,8 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\paolo\\.nuget\\packages\\": {}
+    "C:\\Users\\paolo\\.nuget\\packages\\": {},
+    "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
@@ -2903,16 +2904,20 @@
       "packagesPath": "C:\\Users\\paolo\\.nuget\\packages\\",
       "outputPath": "C:\\github\\spfx-reference-scenarios\\samples\\spfx-middleware\\spfx-middleware-apis\\obj\\",
       "projectStyle": "PackageReference",
+      "fallbackFolders": [
+        "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+      ],
       "configFilePaths": [
         "C:\\Users\\paolo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],
       "originalTargetFrameworks": [
         "net6.0"
       ],
       "sources": {
         "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-        "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {},
+        "C:\\Program Files\\dotnet\\library-packs": {},
         "https://api.nuget.org/v3/index.json": {},
         "https://nuget.pkg.github.com/LegaService/index.json": {},
         "https://nuget.pkg.github.com/PiaSys/index.json": {}
@@ -2977,7 +2982,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.404\\RuntimeIdentifierGraph.json"
       }
     }
   }

diff --git a/samples/spfx-middleware/spfx-middleware-apis/obj/project.nuget.cache b/samples/spfx-middleware/spfx-middleware-apis/obj/project.nuget.cache
@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "PzL6GBciJ4wGbREWkGFYBOiq0W4Jkd+ypkhistLJjQSr18xfs07g3OQYFFXHipvKXAJNrhFNzhrhMJiNOHOlWg==",
+  "dgSpecHash": "FZ0LcmEN64lQt8Grv3WTqVBIGISbsMphwRaBjGquOfufzW77LhnYuIsye2xCnzPGfF0P7/f1Mxa8cQNpLKR+bQ==",
   "success": true,
   "projectFilePath": "C:\\github\\spfx-reference-scenarios\\samples\\spfx-middleware\\spfx-middleware-apis\\spfx-middleware-apis.csproj",
   "expectedPackageFiles": [

diff --git a/...es/spfx-middleware/spfx-middleware-apis/obj/spfx-middleware-apis.csproj.nuget.dgspec.json b/...es/spfx-middleware/spfx-middleware-apis/obj/spfx-middleware-apis.csproj.nuget.dgspec.json
@@ -13,16 +13,20 @@
         "packagesPath": "C:\\Users\\paolo\\.nuget\\packages\\",
         "outputPath": "C:\\github\\spfx-reference-scenarios\\samples\\spfx-middleware\\spfx-middleware-apis\\obj\\",
         "projectStyle": "PackageReference",
+        "fallbackFolders": [
+          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+        ],
         "configFilePaths": [
           "C:\\Users\\paolo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],
         "originalTargetFrameworks": [
           "net6.0"
         ],
         "sources": {
           "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {},
+          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {},
           "https://nuget.pkg.github.com/LegaService/index.json": {},
           "https://nuget.pkg.github.com/PiaSys/index.json": {}
@@ -87,7 +91,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.404\\RuntimeIdentifierGraph.json"
         }
       }
     }

diff --git a/samples/spfx-middleware/spfx-middleware-apis/obj/spfx-middleware-apis.csproj.nuget.g.props b/samples/spfx-middleware/spfx-middleware-apis/obj/spfx-middleware-apis.csproj.nuget.g.props
@@ -5,12 +5,13 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\paolo\.nuget\packages\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\paolo\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\paolo\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props')" />