Skip to content

Commit 4d1d9c5

Browse files
authored
Merge pull request #293 from MicrosoftEdge/smoketest/1.0.3908-testing
Smoketest/1.0.3908 testing
2 parents e38720f + c2256ca commit 4d1d9c5

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

SampleApps/WebView2APISample/ScenarioPermissionManagement.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ std::wstring PermissionKindToString(COREWEBVIEW2_PERMISSION_KIND type)
5353
return L"midi sysex";
5454
case COREWEBVIEW2_PERMISSION_KIND_WINDOW_MANAGEMENT:
5555
return L"window management";
56+
case COREWEBVIEW2_PERMISSION_KIND_PERSISTENT_STORAGE:
57+
return L"persistent storage";
5658
default:
5759
return L"unknown";
5860
}
@@ -76,7 +78,8 @@ std::vector<COREWEBVIEW2_PERMISSION_KIND> permissionKinds{
7678
COREWEBVIEW2_PERMISSION_KIND_NOTIFICATIONS,
7779
COREWEBVIEW2_PERMISSION_KIND_OTHER_SENSORS,
7880
COREWEBVIEW2_PERMISSION_KIND_MIDI_SYSTEM_EXCLUSIVE_MESSAGES,
79-
COREWEBVIEW2_PERMISSION_KIND_WINDOW_MANAGEMENT};
81+
COREWEBVIEW2_PERMISSION_KIND_WINDOW_MANAGEMENT,
82+
COREWEBVIEW2_PERMISSION_KIND_PERSISTENT_STORAGE};
8083

8184
ScenarioPermissionManagement::ScenarioPermissionManagement(AppWindow* appWindow)
8285
: m_appWindow(appWindow), m_webView(appWindow->GetWebView())

SampleApps/WebView2APISample/WebView2APISample.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,13 +534,13 @@
534534
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
535535
<ImportGroup Label="ExtensionTargets">
536536
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
537-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.3848-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.3848-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
537+
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.3908-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.3908-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
538538
</ImportGroup>
539539
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
540540
<PropertyGroup>
541541
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
542542
</PropertyGroup>
543543
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
544-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.3848-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.3848-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
544+
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.3908-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.3908-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
545545
</Target>
546546
</Project>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Web.WebView2" version="1.0.3848-prerelease" targetFramework="native" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.3908-prerelease" targetFramework="native" />
44
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" />
55
</packages>

SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<PlatformTarget>AnyCPU</PlatformTarget>
2626
</PropertyGroup>
2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3848-prerelease" />
28+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3908-prerelease" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<Folder Include="assets\" />

SampleApps/WebView2WpfBrowser/MainWindow.xaml.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ CoreWebView2Profile WebViewProfile
234234
CoreWebView2PermissionKind.LocalFonts,
235235
CoreWebView2PermissionKind.MidiSystemExclusiveMessages,
236236
CoreWebView2PermissionKind.WindowManagement,
237+
CoreWebView2PermissionKind.PersistentStorage,
237238
};
238239

239240
List<CoreWebView2PermissionState> _permissionStates = new List<CoreWebView2PermissionState>
@@ -3310,6 +3311,8 @@ string NameOfPermissionKind(CoreWebView2PermissionKind kind)
33103311
return "MidiSysex";
33113312
case CoreWebView2PermissionKind.WindowManagement:
33123313
return "WindowManagement";
3314+
case CoreWebView2PermissionKind.PersistentStorage:
3315+
return "PersistentStorage";
33133316
default:
33143317
return "Unknown";
33153318
}

SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Content>
6262
</ItemGroup>
6363
<ItemGroup>
64-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3848-prerelease" />
64+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3908-prerelease" />
6565
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
6666
</ItemGroup>
6767
</Project>

0 commit comments

Comments
 (0)