Skip to content

Commit 847ce02

Browse files
feich-msfeich-ms
committed
Move projects to use latest WebView2 SDK 1.0.955-prerelease
1 parent 291356c commit 847ce02

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎SampleApps/WebView2APISample/ControlComponent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ void ControlComponent::TabForwards(size_t currentIndex)
400400
void ControlComponent::TabBackwards(size_t currentIndex)
401401
{
402402
// Find first enabled window before the active one
403-
for (size_t i = currentIndex - 1; i >= 0; i--)
403+
for (size_t i = currentIndex - 1; i >= 0 && i < m_tabbableWindows.size(); i--)
404404
{
405405
HWND hwnd = m_tabbableWindows.at(i).first;
406406
if (IsWindowEnabled(hwnd))

‎SampleApps/WebView2APISample/WebView2APISample.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,13 @@
513513
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
514514
<ImportGroup Label="ExtensionTargets">
515515
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
516-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
516+
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
517517
</ImportGroup>
518518
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
519519
<PropertyGroup>
520520
<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>
521521
</PropertyGroup>
522522
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.191107.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
523-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
523+
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
524524
</Target>
525525
</Project>

‎SampleApps/WebView2APISample/packages.config‎

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.902-prerelease" targetFramework="native" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.955-prerelease" targetFramework="native" />
44
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.191107.2" targetFramework="native" />
55
</packages>

‎SampleApps/WebView2SampleWinComp/WebView2SampleWinComp.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@
207207
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
208208
<ImportGroup Label="ExtensionTargets">
209209
<Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
210-
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
210+
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
211211
</ImportGroup>
212212
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
213213
<PropertyGroup>
214214
<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>
215215
</PropertyGroup>
216216
<Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.200902.2\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
217-
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.902-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
217+
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.955-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
218218
</Target>
219219
</Project>

‎SampleApps/WebView2SampleWinComp/packages.config‎

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.902-prerelease" targetFramework="native" />
3+
<package id="Microsoft.Web.WebView2" version="1.0.955-prerelease" targetFramework="native" />
44
<package id="Microsoft.Windows.ImplementationLibrary" version="1.0.200902.2" targetFramework="native" />
55
</packages>

‎SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PlatformTarget>AnyCPU</PlatformTarget>
2020
</PropertyGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.902-prerelease" />
22+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.955-prerelease" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<None Update="assets\EdgeWebView2-80.jpg">

‎SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
</Content>
2626
</ItemGroup>
2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.902-prerelease" />
28+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.955-prerelease" />
2929
</ItemGroup>
3030
</Project>

0 commit comments

Comments
 (0)