diff --git a/build/CopyFilesToStagingDir.ps1 b/build/CopyFilesToStagingDir.ps1
index f000e5338e..94b9fd9cee 100644
--- a/build/CopyFilesToStagingDir.ps1
+++ b/build/CopyFilesToStagingDir.ps1
@@ -38,10 +38,9 @@ PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\Generic.xaml $FullPubli
PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml.Design\Microsoft.UI.Xaml.Design.dll $FullPublishDir\Microsoft.UI.Xaml.Design\
PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\Microsoft.UI.Xaml.FrameworkPackagePRI\Microsoft.UI.Xaml.pri $FullPublishDir\Microsoft.UI.Xaml.FrameworkPackagePRI\
PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\MUXControls.Test.TAEF\*.dll $FullPublishDir\Test\
-PublishFile -IfExists $FullBuildOutput\Microsoft.UI.Xaml\WebView2Loader.dll $FullPublishDir\Test\
+PublishFile -IfExists $BuildOutputDir\$Configuration\$Platform\MUXControlsTestApp.TAEF\WebView2Loader.dll $FullPublishDir\Test\
PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\MUXControls.ReleaseTest.TAEF\MUXControls.ReleaseTest.dll $FullPublishDir\Test\
PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\MUXControls.ReleaseTest.TAEF\WebView2Loader.dll $FullPublishDir\Test\
-PublishFile -IfExists $FullBuildOutput\NugetPackageTestApp\WebView2Loader.dll $FullPublishDir\Test\
PublishFile -IfExists $BuildOutputDir\$Configuration\AnyCPU\MUXExperimental.Test.TAEF\MUXExperimental.Test.dll $FullPublishDir\Test\
PublishFile -IfExists $FullBuildOutput\Microsoft.Experimental.UI.Xaml\Microsoft.Experimental.UI.Xaml.dll $FullPublishDir\Microsoft.Experimental.UI.Xaml\
diff --git a/build/NuSpecs/MUXControls.nuspec b/build/NuSpecs/MUXControls.nuspec
index 9a156c027c..decd4428f4 100644
--- a/build/NuSpecs/MUXControls.nuspec
+++ b/build/NuSpecs/MUXControls.nuspec
@@ -15,7 +15,7 @@
https://aka.ms/winui_icon
-
+
diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
index e8ff99ec15..ffd1d34b86 100644
--- a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
+++ b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
@@ -15,7 +15,7 @@
https://aka.ms/winui_icon
-
+
diff --git a/dev/WebView2/InteractionTests/WebView2Tests.cs b/dev/WebView2/InteractionTests/WebView2Tests.cs
index 0fe9f5ee54..02edbd409a 100644
--- a/dev/WebView2/InteractionTests/WebView2Tests.cs
+++ b/dev/WebView2/InteractionTests/WebView2Tests.cs
@@ -74,11 +74,11 @@ public static void EnsureBrowser()
// 1. Get installed Edge browser (or WebView2 Runtime) build version info.
int browserBuildVersion = GetInstalledBrowserVersion();
- // 2. Get WebView2Loader.dll Build version info.
- int loaderBuildVersion = GetLoaderBuildVersion();
+ // 2. Get Microsoft.Web.WebView2.Core.dll build version info.
+ int sdkBuildVersion = GetSdkBuildVersion();
// 3. If a runtime isn't installed or the SDK and runtime aren't compatible, install a compatible runtime.
- bool hasCompatibleRuntimeInstalled = GetHasCompatibleRuntimeInstalled(browserBuildVersion, loaderBuildVersion);
+ bool hasCompatibleRuntimeInstalled = GetHasCompatibleRuntimeInstalled(browserBuildVersion, sdkBuildVersion);
if (!hasCompatibleRuntimeInstalled)
{
@@ -155,27 +155,27 @@ private static int GetInstalledBrowserVersion()
return browserBuildVersion;
}
- private static int GetLoaderBuildVersion()
+ private static int GetSdkBuildVersion()
{
- int loaderBuildVersion = 0;
- string loaderPath = Path.Combine(Environment.CurrentDirectory, NativeMethods.LoaderName);
+ int sdkBuildVersion = 0;
+ string dllName = "Microsoft.Web.WebView2.Core.dll";
+ string dllPath = Path.Combine(Environment.CurrentDirectory, dllName);
try
{
- FileVersionInfo loaderVersionInfo = FileVersionInfo.GetVersionInfo(loaderPath);
- loaderBuildVersion = loaderVersionInfo.ProductBuildPart;
+ FileVersionInfo sdkVersionInfo = FileVersionInfo.GetVersionInfo(dllPath);
+ sdkBuildVersion = sdkVersionInfo.ProductBuildPart;
Log.Comment("WebView2Tests Init: Found {0}: version {1} [build version: {2}] (file: {3})",
- NativeMethods.LoaderName,
- loaderVersionInfo.ProductVersion,
- loaderBuildVersion,
- loaderVersionInfo.FileName
- );
+ dllName,
+ sdkVersionInfo.ProductVersion,
+ sdkBuildVersion,
+ sdkVersionInfo.FileName);
}
catch (Exception e)
{
- Log.Error("WebView2Tests Init: could not find loader at {0} [exception: {1}]", loaderPath, e.ToString());
+ Log.Error("WebView2Tests Init: could not find loader at {0} [exception: {1}]", dllPath, e.ToString());
}
- return loaderBuildVersion;
+ return sdkBuildVersion;
}
private static bool GetHasCompatibleRuntimeInstalled(int browserBuildVersion, int loaderBuildVersion)
diff --git a/dev/WebView2/WebView2.cpp b/dev/WebView2/WebView2.cpp
index d7420d73bd..39ec57c985 100644
--- a/dev/WebView2/WebView2.cpp
+++ b/dev/WebView2/WebView2.cpp
@@ -1428,7 +1428,7 @@ winrt::IUnknown WebView2::GetWebView2Provider()
if (m_coreWebViewCompositionController)
{
auto coreWebView2CompositionControllerInterop = m_coreWebViewCompositionController.as();
- winrt::check_hresult(coreWebView2CompositionControllerInterop->get_UIAProvider(provider.put()));
+ winrt::check_hresult(coreWebView2CompositionControllerInterop->get_AutomationProvider(provider.put()));
}
return provider.as();
}
@@ -1441,7 +1441,7 @@ winrt::IUnknown WebView2::GetProviderForHwnd(HWND hwnd)
// If there is no provider for the given HWND, CoreWebview2 will return UIA_E_ELEMENTNOTAVAILABLE,
// and we should just return an empty provider
auto coreWebView2EnvironmentInterop = m_coreWebViewEnvironment.as();
- winrt::hresult hr = coreWebView2EnvironmentInterop->GetProviderForHwnd(hwnd, provider.put());
+ winrt::hresult hr = coreWebView2EnvironmentInterop->GetAutomationProviderForWindow(hwnd, provider.put());
if (hr != UIA_E_ELEMENTNOTAVAILABLE)
{
winrt::check_hresult(hr);
diff --git a/dev/WebView2/WebView2.idl b/dev/WebView2/WebView2.idl
index fcf4cadfd5..c04a89910e 100644
--- a/dev/WebView2/WebView2.idl
+++ b/dev/WebView2/WebView2.idl
@@ -4,7 +4,7 @@ namespace MU_XC_NAMESPACE
{
[webhosthidden]
-[MUX_PREVIEW]
+[MUX_PUBLIC]
runtimeclass CoreWebView2InitializedEventArgs
{
HRESULT Exception{ get; };
@@ -13,7 +13,7 @@ runtimeclass CoreWebView2InitializedEventArgs
[webhosthidden]
[MUX_PROPERTY_CHANGED_CALLBACK(TRUE)]
[MUX_PROPERTY_CHANGED_CALLBACK_METHODNAME("OnPropertyChanged")]
-[MUX_PREVIEW]
+[MUX_PUBLIC]
unsealed runtimeclass WebView2 : Windows.UI.Xaml.Controls.Control
{
WebView2();
diff --git a/dev/dll/Microsoft.UI.Xaml.Common.targets b/dev/dll/Microsoft.UI.Xaml.Common.targets
index 16c87021d5..4d501a28ca 100644
--- a/dev/dll/Microsoft.UI.Xaml.Common.targets
+++ b/dev/dll/Microsoft.UI.Xaml.Common.targets
@@ -427,7 +427,7 @@
-
+
$(OutDir)Merged
@@ -726,7 +726,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/test/MUXControls.Test/MSTest/MUXControls.Test.csproj b/test/MUXControls.Test/MSTest/MUXControls.Test.csproj
index af50495762..1c650c3c3a 100644
--- a/test/MUXControls.Test/MSTest/MUXControls.Test.csproj
+++ b/test/MUXControls.Test/MSTest/MUXControls.Test.csproj
@@ -12,6 +12,7 @@
+
@@ -21,11 +22,6 @@
-
-
- 1.0.1020.30
-
-
diff --git a/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj b/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
index a15263e892..b32145ab8f 100644
--- a/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
+++ b/test/MUXControls.Test/TAEF/MUXControls.Test.TAEF.csproj
@@ -17,7 +17,7 @@
true
-
+
@@ -35,7 +35,6 @@
-
diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj
index 83106dc17c..c868f1bcae 100644
--- a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj
+++ b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/RuntimeComponentThatUsesMUX.vcxproj
@@ -145,7 +145,7 @@
-
+
@@ -154,7 +154,7 @@
-
+
diff --git a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/packages.config b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/packages.config
index a9b7c5d8f6..414eaa956f 100644
--- a/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/packages.config
+++ b/test/MUXControlsReleaseTest/RuntimeComponentThatUsesMUX/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
index b98cac8471..f90a6a5bc3 100644
--- a/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
+++ b/test/MUXControlsTestApp/MSTest/MUXControlsTestApp.csproj
@@ -56,7 +56,7 @@
- 1.0.1020.30
+ 1.0.1264.42
diff --git a/test/MUXControlsTestApp/TAEF/project.json b/test/MUXControlsTestApp/TAEF/project.json
index 4e43770971..50f7e13fce 100644
--- a/test/MUXControlsTestApp/TAEF/project.json
+++ b/test/MUXControlsTestApp/TAEF/project.json
@@ -3,7 +3,7 @@
"DiffPlex": "1.2.1",
"Microsoft.Net.Native.Compiler": "2.2.3",
"Microsoft.NETCore.UniversalWindowsPlatform": "6.2.8",
- "Microsoft.Web.WebView2": "1.0.1020.30",
+ "Microsoft.Web.WebView2": "1.0.1264.42",
"MUXCustomBuildTasks": "1.0.74",
"TAEF.Redist.Wlk": "10.31.180822002",
"Win2D.uwp": "1.22.0"
diff --git a/test/TestAppCX/TestAppCX.vcxproj b/test/TestAppCX/TestAppCX.vcxproj
index a0284467f0..24f752dc3a 100644
--- a/test/TestAppCX/TestAppCX.vcxproj
+++ b/test/TestAppCX/TestAppCX.vcxproj
@@ -306,12 +306,12 @@
-
+
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}.
-
+
\ No newline at end of file
diff --git a/test/TestAppCX/packages.config b/test/TestAppCX/packages.config
index 2f72269700..be587a6852 100644
--- a/test/TestAppCX/packages.config
+++ b/test/TestAppCX/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file