Skip to content

FI main into feature branch WNP_ToastNotifications_L1 #2123

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

Merged
loneursid merged 42 commits into from
Feb 18, 2022
Merged

FI main into feature branch WNP_ToastNotifications_L1 #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
807079a
Enable SBOM generation for WindowsAppSDK (#1979)
kythant Jan 13, 2022
619e96d
TDBuild - updating localized resource files.
Jan 14, 2022
4c01140
Update dependencies from https://dev.azure.com/microsoft/ProjectReuni…
Jan 14, 2022
1939b16
TDBuild - updating localized resource files.
Jan 15, 2022
e739a21
DDLM package names are Microsoft.WinAppRuntime.DDLM.<minor><patch>.<m…
DrusTheAxe Jan 18, 2022
0b82e7d
TDBuild - updating localized resource files.
Jan 19, 2022
dfad56a
Add new font selection APIs to DWrite API spec (#1967)
niklasb-ms Jan 19, 2022
7f86048
AppLifecycle Restart API (#1134)
hamza-usmani Jan 20, 2022
c9e6cd1
Initial RequestRestartNow API (#1882)
aeloros Jan 20, 2022
92a6e64
Add MRTCore interface name and id (#1989)
huichen123 Jan 24, 2022
11e2a1a
Correct CsWinRTWindowsMetadata
j0shuams Jan 25, 2022
e0ea600
WindowsSdkPackageVersion
j0shuams Jan 25, 2022
f5be713
Suffix
j0shuams Jan 25, 2022
3ebec9f
suffix only
j0shuams Jan 25, 2022
b9e7e7a
22
j0shuams Jan 25, 2022
211fa53
Update
j0shuams Jan 25, 2022
9fc0fe1
Update dependencies from https://dev.azure.com/microsoft/ProjectReuni…
Jan 26, 2022
0780fe5
Generate cert (#1986)
DrusTheAxe Jan 26, 2022
6df1822
Merge/Port 1.0 license support into main/1.1 (#2012)
DrusTheAxe Jan 26, 2022
db1bd6d
Update to FrameworkUDK 1.1.0-CI-22541.1000.220124-0934.0 (#2019)
kythant Jan 26, 2022
51a8c99
Exclude CsWinRT.Dependency (#2021)
kythant Jan 26, 2022
a97ba0b
Bad merge fix missed copying main_license.xml to the testpackages dir…
DrusTheAxe Jan 26, 2022
4beff30
Merge pull request #2015 from j0shuams/jlarkin/cswinrt
j0shuams Jan 27, 2022
ea8a33c
Merge branch 'main' into jlarkin/cswinrt-150
j0shuams Jan 27, 2022
40461bf
Feature for sharing security descriptors (take 2) (#2005)
DefaultRyan Jan 27, 2022
64fa72e
Reworded a password prompt for clarity (#2035)
DrusTheAxe Jan 28, 2022
3d773e8
Merge pull request #2016 from j0shuams/jlarkin/cswinrt-150
j0shuams Jan 28, 2022
689f348
Remove 19h1 and add 21H1 to Helix test queue. (#2038)
kythant Jan 28, 2022
d020e69
Windows SDK version should match that of other projects (#2043)
loneursid Jan 29, 2022
93c6b28
Moving Intellisense files to single location (#2028)
EricJohnson327 Jan 29, 2022
da1c42c
Reworded a password prompt for clarity (#2045)
DrusTheAxe Jan 31, 2022
0f6218b
Enable APIscan-friendly build options (#2050)
DrusTheAxe Feb 2, 2022
e07759d
DynamicDependencies: support elevation (#2066)
DrusTheAxe Feb 4, 2022
ef2c8ad
ignore failures button'
kythant Feb 4, 2022
79314a2
Revert "ignore failures button'"
kythant Feb 4, 2022
050b994
Add button to allow publishing even if there are test failures (#2070)
kythant Feb 4, 2022
c053939
Update to FrameworkUDK 1.1.0-CI-22541.1001.220207-1139.1 (#2077)
kythant Feb 9, 2022
acc8cc9
Move CSWinRT to Toolset Dependencies in Version.Details.xml (#2084)
kythant Feb 9, 2022
95ce887
Update dependencies from https://dev.azure.com/microsoft/ProjectReuni…
Feb 10, 2022
98a4e32
Adding a non-async PowerNotificiations::EffectivePowerMode method (#2…
huzaifa-d Feb 11, 2022
5ca8019
Update dependencies from https://github.com/microsoft/CsWinRT build 1…
Feb 12, 2022
d93b299
Merge branch 'main' into user/erlangl/WNP_ToastNotifications_L1/FI_ma…
Feb 17, 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
3 changes: 3 additions & 0 deletions WindowsAppRuntime.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1240,6 +1240,7 @@ Global
{BC5E5A3E-E733-4388-8B00-F8495DA7C778} = {3DE93B2F-F887-437D-B512-6B1024ABA290}
{34671779-4A4D-4D0E-B259-CD0F14D4F6D4} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{885A43FA-052D-4B0D-A2DC-13EE15796435} = {34671779-4A4D-4D0E-B259-CD0F14D4F6D4}
{BC5E5A3E-E733-4388-8B00-F8495DA7C778} = {3DE93B2F-F887-437D-B512-6B1024ABA290}
{A06B7FE8-D201-4EA2-BB10-61B4595EC377} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{C91BCB93-9ED1-4ACD-85F3-26F9F6AC52E3} = {A06B7FE8-D201-4EA2-BB10-61B4595EC377}
{08BC78E0-63C6-49A7-81B3-6AFC3DEAC4DE} = {8630F7AA-2969-4DC9-8700-9B468C1DC21D}
Expand All @@ -1249,6 +1250,8 @@ Global
{E695A08E-8735-41CD-AE55-A5B589BA297F} = {AC5FFC80-92FE-4933-BED2-EC5519AC4440}
{1C9A0791-2BAA-420B-84B6-C0721F22A6E8} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{B4824897-88E0-4927-8FB9-E60106F01ED9} = {1C9A0791-2BAA-420B-84B6-C0721F22A6E8}
{34671779-4A4D-4D0E-B259-CD0F14D4F6D4} = {448ED2E5-0B37-4D97-9E6B-8C10A507976A}
{885A43FA-052D-4B0D-A2DC-13EE15796435} = {34671779-4A4D-4D0E-B259-CD0F14D4F6D4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B3D7591-CFEC-4762-9A07-ABE99938FB77}
Expand Down
10 changes: 5 additions & 5 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Windows.CsWinRT" Version="1.5.0-prerelease.220124.4">
<Dependency Name="Microsoft.Windows.CsWinRT" Version="1.5.0">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>c90d2e33c650b65377a3eb046f1f449d56e2ab7d</Sha>
<Sha>394ce3a7fb435b99010ee4ed8690789944e08870</Sha>
</Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreSdk" Version="5.0.404">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
Expand All @@ -18,11 +18,11 @@
</Dependency>
<Dependency Name="CsWinRT.Dependency.DotNetCoreRuntime" Version="5.0.13">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>c90d2e33c650b65377a3eb046f1f449d56e2ab7d</Sha>
<Sha>394ce3a7fb435b99010ee4ed8690789944e08870</Sha>
</Dependency>
<Dependency Name="CsWinRT.Dependency.WindowsSdkPackage" Version="23-preview">
<Dependency Name="CsWinRT.Dependency.WindowsSdkPackage" Version="23">
<Uri>https://github.com/microsoft/CsWinRT</Uri>
<Sha>c90d2e33c650b65377a3eb046f1f449d56e2ab7d</Sha>
<Sha>394ce3a7fb435b99010ee4ed8690789944e08870</Sha>
</Dependency>
<Dependency Name="Microsoft.WinAppSDK.EngCommon" Version="1.1.0-20220210.0-CI">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MicrosoftWindowsCsWinRTPackageVersion>1.5.0-prerelease.220124.4</MicrosoftWindowsCsWinRTPackageVersion>
<MicrosoftWindowsCsWinRTPackageVersion>1.5.0</MicrosoftWindowsCsWinRTPackageVersion>
<CsWinRTDependencyDotNetCoreSdkPackageVersion>5.0.404</CsWinRTDependencyDotNetCoreSdkPackageVersion>
<CsWinRTDependencyDotNetCoreRuntimePackageVersion>5.0.13</CsWinRTDependencyDotNetCoreRuntimePackageVersion>
<CsWinRTDependencyWindowsSdkPackagePackageVersion>23-preview</CsWinRTDependencyWindowsSdkPackagePackageVersion>
<CsWinRTDependencyWindowsSdkPackagePackageVersion>23</CsWinRTDependencyWindowsSdkPackagePackageVersion>
<!-- TODO: Fix DownloadDotNetCoreSdk.ps1 script so we don't need this property -->
<CsWinRTDependencyDotNetCoreSdkLkgPackageVersion>$(CsWinRTDependencyDotNetCoreSdkPackageVersion)</CsWinRTDependencyDotNetCoreSdkLkgPackageVersion>
</PropertyGroup>
Expand Down