VCVars: Fix generation if OS is set to WindowsStore (#17849)

* Fix VCVars generate() for WindowsStore OS

* Add newline at the end of file

Author: mkskelet

conan/tools/microsoft/visual.py

@@ -117,7 +117,7 @@ def generate(self, scope="build"):
         os_ = conanfile.settings.get_safe("os")
         build_os_ = conanfile.settings_build.get_safe("os")
 
-        if os_ != "Windows" or build_os_ != "Windows":
+        if (os_ != "Windows" and os_ != "WindowsStore") or build_os_ != "Windows":
             return
 
         compiler = conanfile.settings.get_safe("compiler")

test/integration/toolchains/microsoft/vcvars_test.py

@@ -160,3 +160,21 @@ class TestConan(ConanFile):
 
     vcvars = client.load("conanvcvars.bat")
     assert 'vcvarsall.bat"  amd64 -vcvars_ver=14.33' in vcvars
+
+@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+def test_vcvars_armv8_windows_store():
+    client = TestClient(path_with_spaces=False)
+
+    conanfile = textwrap.dedent("""
+        from conan import ConanFile
+        class TestConan(ConanFile):
+            generators = "VCVars"
+            settings = "os", "compiler", "arch", "build_type"
+    """)
+    client.save({"conanfile.py": conanfile})
+    client.run('install . -s:b os=Windows -s compiler="msvc" -s compiler.version=194 '
+               '-s compiler.cppstd=14 -s compiler.runtime=static -s:h arch=armv8 '
+               '-s:h os=WindowsStore -s:h os.version=10.0')
+
+    vcvars = client.load("conanvcvars.bat")
+    assert 'vcvarsall.bat"  amd64_arm64' in vcvars