Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FI from main to develop #2377

Merged
merged 13 commits into from
Apr 8, 2022
Merged

FI from main to develop #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
53a24ce
Update dependencies from https://github.com/microsoft/CsWinRT build 1…
dotnet-maestro[bot] Mar 15, 2022
7e58e65
test push
kythant Apr 2, 2022
6988440
Revert "test push"
kythant Apr 2, 2022
fed5cbe
Merge pull request #2264 from microsoft/darc-main-3b73d6e9-91de-492f-…
manodasanW Apr 3, 2022
d2bd64a
App considerations for Hybrid CRT - xcopyability (#2354)
Scottj1s Apr 4, 2022
3b6fdc6
Fix doccomment (#2357)
DrusTheAxe Apr 4, 2022
0f5e22f
Add missing '>' to Microsoft.WindowsAppSDK.Bootstrap.CS.targets (#2358)
kythant Apr 4, 2022
085aac8
Fix Package.appxmanifest not appearing in Solution Explorer when crea…
evelynwu-msft Apr 4, 2022
3e11dd5
Bootstrap AutoInitialize - Fix typos due to bad merge (#2368)
DrusTheAxe Apr 6, 2022
fe64ab9
Remove the duplicate ToastNotifications-spec.md in spec\PushNotificat…
pmpurifoy Apr 6, 2022
fb187a0
Add API contract version to Deployment interface (#2249)
sachintaMSFT Apr 8, 2022
c9d70a4
Resolve issues where AppInstance.FindOrRegisterForKey("key") can retu…
jlaanstra Apr 8, 2022
957bd09
Merge branch 'main' of https://github.com/microsoft/WindowsAppSDK int…
kythant Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 153 additions & 0 deletions WindowsAppRuntime.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{0419CA
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "dev\Common\Common.vcxitems", "{8828053C-D6EC-4744-8624-F8C676C2D4DF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test_BootstrapAutoInitialize", "Test_BootstrapAutoInitialize", "{33609C47-60F4-48ED-AB2C-83A89C17255F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_BootstrapAutoInitialize_CPP_Default", "test\DynamicDependency\Test_BootstrapAutoInitialize\CPP\Test_BootstrapAutoInitialize_CPP_Default\Test_BootstrapAutoInitialize_CPP_Default.vcxproj", "{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CPP", "CPP", "{A05C260F-877D-49C2-968A-164E5A904422}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_BootstrapAutoInitialize_CPP_Options_Default", "test\DynamicDependency\Test_BootstrapAutoInitialize\CPP\Test_BootstrapAutoInitialize_CPP_Options_Default\Test_BootstrapAutoInitialize_CPP_Options_Default.vcxproj", "{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_BootstrapAutoInitialize_CPP_Options_Defined", "test\DynamicDependency\Test_BootstrapAutoInitialize\CPP\Test_BootstrapAutoInitialize_CPP_Options_Defined\Test_BootstrapAutoInitialize_CPP_Options_Defined.vcxproj", "{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test_BootstrapAutoInitialize_CPP_Options_None", "test\DynamicDependency\Test_BootstrapAutoInitialize\CPP\Test_BootstrapAutoInitialize_CPP_Options_None\Test_BootstrapAutoInitialize_CPP_Options_None.vcxproj", "{822E1679-8F71-4477-BE44-9EC77983360E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CS", "CS", "{99C514E4-A6B3-4B09-B870-5511EF9D93AC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test_BootstrapAutoInitialize_CS_Default", "test\DynamicDependency\Test_BootstrapAutoInitialize\CS\Test_BootstrapAutoInitialize_CS_Default\Test_BootstrapAutoInitialize_CS_Default.csproj", "{11C74DA1-A6FA-4027-8FA4-F25450CADF09}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test_BootstrapAutoInitialize_CS_Options_Default", "test\DynamicDependency\Test_BootstrapAutoInitialize\CS\Test_BootstrapAutoInitialize_CS_Options_Default\Test_BootstrapAutoInitialize_CS_Options_Default.csproj", "{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test_BootstrapAutoInitialize_CS_Options_Defined", "test\DynamicDependency\Test_BootstrapAutoInitialize\CS\Test_BootstrapAutoInitialize_CS_Options_Defined\Test_BootstrapAutoInitialize_CS_Options_Defined.csproj", "{D9139E3C-8D21-4BD9-84E3-30A03A54D610}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test_BootstrapAutoInitialize_CS_Options_None", "test\DynamicDependency\Test_BootstrapAutoInitialize\CS\Test_BootstrapAutoInitialize_CS_Options_None\Test_BootstrapAutoInitialize_CS_Options_None.csproj", "{4A74BBED-3B20-44A7-B6FF-3373160DE741}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
test\inc\inc.vcxitems*{08bc78e0-63c6-49a7-81b3-6afc3deac4de}*SharedItemsImports = 4
Expand Down Expand Up @@ -1190,6 +1212,126 @@ Global
{50451390-66E7-4465-8804-427560625794}.Release|x64.Build.0 = Release|x64
{50451390-66E7-4465-8804-427560625794}.Release|x86.ActiveCfg = Release|Win32
{50451390-66E7-4465-8804-427560625794}.Release|x86.Build.0 = Release|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|Any CPU.ActiveCfg = Debug|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|ARM64.ActiveCfg = Debug|ARM64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|ARM64.Build.0 = Debug|ARM64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|x64.ActiveCfg = Debug|x64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|x64.Build.0 = Debug|x64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|x86.ActiveCfg = Debug|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Debug|x86.Build.0 = Debug|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|Any CPU.ActiveCfg = Release|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|ARM64.ActiveCfg = Release|ARM64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|ARM64.Build.0 = Release|ARM64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|x64.ActiveCfg = Release|x64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|x64.Build.0 = Release|x64
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|x86.ActiveCfg = Release|Win32
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617}.Release|x86.Build.0 = Release|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|Any CPU.ActiveCfg = Debug|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|ARM64.Build.0 = Debug|ARM64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|x64.ActiveCfg = Debug|x64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|x64.Build.0 = Debug|x64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|x86.ActiveCfg = Debug|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Debug|x86.Build.0 = Debug|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|Any CPU.ActiveCfg = Release|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|ARM64.ActiveCfg = Release|ARM64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|ARM64.Build.0 = Release|ARM64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|x64.ActiveCfg = Release|x64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|x64.Build.0 = Release|x64
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|x86.ActiveCfg = Release|Win32
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A}.Release|x86.Build.0 = Release|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|Any CPU.ActiveCfg = Debug|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|ARM64.ActiveCfg = Debug|ARM64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|ARM64.Build.0 = Debug|ARM64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|x64.ActiveCfg = Debug|x64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|x64.Build.0 = Debug|x64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|x86.ActiveCfg = Debug|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Debug|x86.Build.0 = Debug|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|Any CPU.ActiveCfg = Release|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|ARM64.ActiveCfg = Release|ARM64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|ARM64.Build.0 = Release|ARM64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|x64.ActiveCfg = Release|x64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|x64.Build.0 = Release|x64
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|x86.ActiveCfg = Release|Win32
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB}.Release|x86.Build.0 = Release|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|Any CPU.ActiveCfg = Debug|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|ARM64.ActiveCfg = Debug|ARM64
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|ARM64.Build.0 = Debug|ARM64
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|x64.ActiveCfg = Debug|x64
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|x64.Build.0 = Debug|x64
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|x86.ActiveCfg = Debug|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Debug|x86.Build.0 = Debug|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|Any CPU.ActiveCfg = Release|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|ARM64.ActiveCfg = Release|ARM64
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|ARM64.Build.0 = Release|ARM64
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|x64.ActiveCfg = Release|x64
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|x64.Build.0 = Release|x64
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|x86.ActiveCfg = Release|Win32
{822E1679-8F71-4477-BE44-9EC77983360E}.Release|x86.Build.0 = Release|Win32
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|ARM64.ActiveCfg = Debug|arm64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|ARM64.Build.0 = Debug|arm64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|x64.ActiveCfg = Debug|x64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|x64.Build.0 = Debug|x64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|x86.ActiveCfg = Debug|x86
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Debug|x86.Build.0 = Debug|x86
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|Any CPU.Build.0 = Release|Any CPU
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|ARM64.ActiveCfg = Release|arm64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|ARM64.Build.0 = Release|arm64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|x64.ActiveCfg = Release|x64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|x64.Build.0 = Release|x64
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|x86.ActiveCfg = Release|x86
{11C74DA1-A6FA-4027-8FA4-F25450CADF09}.Release|x86.Build.0 = Release|x86
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|ARM64.ActiveCfg = Debug|arm64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|ARM64.Build.0 = Debug|arm64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|x64.ActiveCfg = Debug|x64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|x64.Build.0 = Debug|x64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|x86.ActiveCfg = Debug|x86
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Debug|x86.Build.0 = Debug|x86
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|Any CPU.Build.0 = Release|Any CPU
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|ARM64.ActiveCfg = Release|arm64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|ARM64.Build.0 = Release|arm64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|x64.ActiveCfg = Release|x64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|x64.Build.0 = Release|x64
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|x86.ActiveCfg = Release|x86
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF}.Release|x86.Build.0 = Release|x86
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|ARM64.ActiveCfg = Debug|arm64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|ARM64.Build.0 = Debug|arm64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|x64.ActiveCfg = Debug|x64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|x64.Build.0 = Debug|x64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|x86.ActiveCfg = Debug|x86
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Debug|x86.Build.0 = Debug|x86
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|Any CPU.Build.0 = Release|Any CPU
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|ARM64.ActiveCfg = Release|arm64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|ARM64.Build.0 = Release|arm64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|x64.ActiveCfg = Release|x64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|x64.Build.0 = Release|x64
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|x86.ActiveCfg = Release|x86
{D9139E3C-8D21-4BD9-84E3-30A03A54D610}.Release|x86.Build.0 = Release|x86
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|ARM64.ActiveCfg = Debug|arm64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|ARM64.Build.0 = Debug|arm64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|x64.ActiveCfg = Debug|x64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|x64.Build.0 = Debug|x64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|x86.ActiveCfg = Debug|x86
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Debug|x86.Build.0 = Debug|x86
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|Any CPU.Build.0 = Release|Any CPU
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|ARM64.ActiveCfg = Release|arm64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|ARM64.Build.0 = Release|arm64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|x64.ActiveCfg = Release|x64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|x64.Build.0 = Release|x64
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|x86.ActiveCfg = Release|x86
{4A74BBED-3B20-44A7-B6FF-3373160DE741}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1292,6 +1434,17 @@ Global
{50451390-66E7-4465-8804-427560625794} = {82A73181-EA4A-431A-B82B-BE6734604CC9}
{0419CA2B-5ED1-49F0-B70B-5F470A15D3D0} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{8828053C-D6EC-4744-8624-F8C676C2D4DF} = {0419CA2B-5ED1-49F0-B70B-5F470A15D3D0}
{33609C47-60F4-48ED-AB2C-83A89C17255F} = {17B1F036-8FC3-49E6-9464-0C1F96CEAEB9}
{53E3E9A7-11BE-4BBC-981F-AF98A1B00617} = {A05C260F-877D-49C2-968A-164E5A904422}
{A05C260F-877D-49C2-968A-164E5A904422} = {33609C47-60F4-48ED-AB2C-83A89C17255F}
{F9BA7D03-5B5F-4FF1-A3A6-81B64FBDFE2A} = {A05C260F-877D-49C2-968A-164E5A904422}
{EDAC8AF1-CBD2-41D4-8AB1-02BECD9E01CB} = {A05C260F-877D-49C2-968A-164E5A904422}
{822E1679-8F71-4477-BE44-9EC77983360E} = {A05C260F-877D-49C2-968A-164E5A904422}
{99C514E4-A6B3-4B09-B870-5511EF9D93AC} = {33609C47-60F4-48ED-AB2C-83A89C17255F}
{11C74DA1-A6FA-4027-8FA4-F25450CADF09} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
{0EF1080B-15C6-42E7-A0E2-D624D85C3EBF} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
{D9139E3C-8D21-4BD9-84E3-30A03A54D610} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
{4A74BBED-3B20-44A7-B6FF-3373160DE741} = {99C514E4-A6B3-4B09-B870-5511EF9D93AC}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand Down
1 change: 0 additions & 1 deletion build/NuSpecs/Microsoft.WindowsAppSDK.Bootstrap.CS.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<DefineConstants
<DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_Default)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_DEFAULT</DefineConstants>
<DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_None)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_NONE</DefineConstants>
<DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_DebugBreak)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK</DefineConstants>
Expand Down
13 changes: 12 additions & 1 deletion build/ProjectReunion-CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,21 @@ variables:
value: $(Build.SourcesDirectory)\BuildOutput

jobs:
- job: CredScan
- job: PreChecks
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: 'Smoke test props and targets in \build\NuSpecs'
inputs:
targetType: 'inline'
script: |
$targetPaths = "$(Build.SourcesDirectory)\build\NuSpecs\*.targets"
$propPaths = "$(Build.SourcesDirectory)\build\NuSpecs\*.props"
Get-ChildItem $targetPaths | ForEach-Object { $_.Name; [xml](Get-Content $_) | Out-Null }
Get-ChildItem $propPaths | ForEach-Object { $_.Name; [xml](Get-Content $_) | Out-Null }
failOnStderr: true

# Scans the root source folder for security vulnerability
- task: CredScan@2
inputs:
Expand Down
27 changes: 20 additions & 7 deletions dev/AppLifecycle/AppInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
if (m_isCurrent)
{
m_key.Reset();
m_keyCreationMutexLock.reset();
m_keyCreationMutex.reset();
}
}
Expand Down Expand Up @@ -578,19 +579,31 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation
// processes from seeing the mutex but not seeing the Key on the instance yet.
auto releaseOnExit = m_dataMutex.acquire();

// We keep the mutex as a live member to ensure all other instances continue
// First caller creates the named mutex. All other instances continue
// to get an 'open' instead of a 'create' due to it already existing.
// try_create returns true for a named mutex that already exists
// and so we can't rely on try_create and have to explicitly check GetLastError().
m_keyCreationMutex.create(mutexName.c_str(), 0, MUTEX_ALL_ACCESS);
wil::unique_mutex keyCreationMutex;
keyCreationMutex.create(mutexName.c_str(), 0, MUTEX_ALL_ACCESS);

bool currentIsKeyOwner = (GetLastError() != ERROR_ALREADY_EXISTS);
if (currentIsKeyOwner)
DWORD waitResult = 0;
// Wait for 0 seconds. If the mutex is taken we don't own the mutex
auto lock = keyCreationMutex.acquire(&waitResult, 0);

if (waitResult != WAIT_TIMEOUT)
{
// We acquired the named mutex, store the mutex itself and the lock as a member.
// We keep the mutex and lock as a live member to ensure it stays alive for
// as long as we own the mutex
// NOTE: Assigning the new mutex will release the old one if it exists.
// Therefore make sure to release the lock first.
m_keyCreationMutexLock = std::move(lock);
m_keyCreationMutex = std::move(keyCreationMutex);

m_key.Resize((key.length() + 1) * sizeof(key.data()[0]));
THROW_IF_FAILED(StringCchCopy(m_key.Get(), (m_key.Size() / sizeof(wchar_t)), key.c_str()));

return true;
}
return currentIsKeyOwner;
return false;
}

Microsoft::Windows::AppLifecycle::AppInstance AppInstance::FindForKey(std::wstring const& key)
Expand Down
4 changes: 4 additions & 0 deletions dev/AppLifecycle/AppInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ namespace winrt::Microsoft::Windows::AppLifecycle::implementation

wil::unique_mutex m_dataMutex;
wil::unique_mutex m_keyCreationMutex;
// Listing this after the mutex it locks, guarantees that
// the lock gets released first before releasing the mutex itself.
// Destruction order is reverse of declaration order, see C++ std: 12.6.2
wil::mutex_release_scope_exit m_keyCreationMutexLock;
SharedMemory<wchar_t> m_key;

wil::unique_event m_innerActivated;
Expand Down
5 changes: 5 additions & 0 deletions dev/VSIX/ProjectTemplates/Desktop/CppWinRT/SingleProjectPackagedApp/ProjectTemplate.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup Condition="'$(WindowsPackageType)'!='None' and Exists('Package.appxmanifest')">
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<Manifest Include="app.manifest" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions dev/WindowsAppRuntime_BootstrapDLL/MddBootstrap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ namespace DynamicDependency::Bootstrap
///
/// #include <iostream>
///
/// using MddBootstrap = Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap;
/// namespace MddBootstrap { using namespace ::Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap; }
///
/// int main()
/// {
Expand Down Expand Up @@ -248,7 +248,7 @@ namespace DynamicDependency::Bootstrap
///
/// #include <iostream>
///
/// using MddBootstrap = MddBootstrap;
/// namespace MddBootstrap { using namespace ::Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap; }
///
/// int main()
/// {
Expand Down Expand Up @@ -300,7 +300,7 @@ namespace DynamicDependency::Bootstrap
///
/// #include <iostream>
///
/// using MddBootstrap = Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap;
/// namespace MddBootstrap { using namespace ::Microsoft::Windows::ApplicationModel::DynamicDependency::Bootstrap; }
///
/// int main()
/// {
Expand Down
Loading