-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
FI develop into notification feature branch (#2733)
* update newtonsoft.json (#2688) * Introduce Register Overload for assets (#2596) * Introduce Register Overload for assets * Address comments * Add contractversion to register APi * Address comments * Add more examples of register API usage * Process doc for develop branch (#2383) * Add 1.1.2 tag to bug report * Properly ignore cleanup event if it can't be opened. (#2658) If we can't open the cleanup event, ignore it. Fixes ADO#38606299 * WindowsAppRuntimeInstaller.exe fails if newer version present Discussion #2708: [WindowsAppRuntime installation error: The package could not be installed because a higher version of this package is already installed](#2708) >Microsoft.WindowsAppRuntime.1.1_1000.516.2156.0_x64__8wekyb3d8bbwe Package deployment result : 0x80073d06 The package could not be installed because a higher version of this package is already installed. One or more install operations failed. Result: 0x80073d06 That's a bug - it should be OK, not an error. If v1.1.3 is installed and you run the installer for v1.1.2 we call packageManager.AddPackageAsync(...v1.1.2...) which returns 0x80073d06 == `ERROR_INSTALL_PACKAGE_DOWNGRADE` which is technically an error but functionally it's OK. If you build with 1.1.2 we don't require the runtime packages exactly match 1.1.2, but rather that there needs to be a package equal-or-higher than 1.1.2 (i.e. `>=1.1.2` not `==1.1.2`). If 1.1.3 is installed then all is well. Problem is we should be trapping `ERROR_INSTALL_PACKAGE_DOWNGRADE` and treating it as success. That's a bug on our part. https://task.ms/40411617 FYI: servicing-consider-1.1 = https://task.ms/40411679 * XCOPY command should be <COPY> to ensure execution (#2734) * XCOPY command should be XCOPY.EXE to ensure execution * Changed xcopy.exe to <Copy> * Fix typo * Put AccessControl files into transport package (#2751) * Add projection DLL * Put files into nuget package * Remove noexcept from Bootstrapper API so it can be used from C (#2750) * Remove noexcept from Bootstrapper API so it can be used from C * Switch noexcept to macro-style optional support per feedback * Update bug version to 1.1.3 (#2757) * <Copy> vs XCOPY.EXE -- Unbreak WindowsAppSDK-Nuget-Native.C.props Not-Build break 'build\native\WindowsAppSDK-Nuget-Native.C.props(32,13): error MSB4066: The attribute 'SourceFiles' in element is unrecognized.' -- Foundation builds but the aggregator doesn't. I suspect it's because of the command can't go in a , maybe something more complicated with the PostBuildEvent DependsOn a to do the copy...but I can't find any clear docs or net links clearly spelling it out so rather than fiddling while Rome burns I'm switching back to the original xcopy.exe solution to un-break the pipeline. Will follow up with folks to understand why the PR's build didn't pick this up * Updating reference to pick up license installation fix. (#2531) (#2764) Co-authored-by: Ben Kuhn <[email protected]> Co-authored-by: Hui Chen <[email protected]> Co-authored-by: reunion-maestro-bot <[email protected]> Co-authored-by: Sharath Manchala <[email protected]> Co-authored-by: MikeHillberg <[email protected]> Co-authored-by: Gabby Bilka <[email protected]> Co-authored-by: Gabby Bilka <[email protected]> Co-authored-by: Johan Laanstra <[email protected]> Co-authored-by: Howard Kapustein <[email protected]> Co-authored-by: Eric Langlois <[email protected]> Co-authored-by: Ryan Shepherd <[email protected]> Co-authored-by: sachintaMSFT <[email protected]> Co-authored-by: Ben Kuhn <[email protected]>
- Loading branch information
1 parent
6149efb
commit d394165
Showing
11 changed files
with
98 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...urity.AccessControl.Projection/Microsoft.Windows.Security.AccessControl.Projection.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<Project Sdk="Microsoft.NET.Sdk"> | ||
<PropertyGroup> | ||
<TargetFramework>net5.0-windows10.0.17763.0</TargetFramework> | ||
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion> | ||
<Platforms>x64;x86;arm64</Platforms> | ||
<PlatformTarget>AnyCPU</PlatformTarget> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<PackageReference Include="Microsoft.SourceLink.Common" Version="1.1.0-beta-21055-01"> | ||
<PrivateAssets>all</PrivateAssets> | ||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20204-02"> | ||
<PrivateAssets>all</PrivateAssets> | ||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
</PackageReference> | ||
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" /> | ||
</ItemGroup> | ||
|
||
<PropertyGroup> | ||
<CSWinRTIncludes>Microsoft.Windows.Security.AccessControl</CSWinRTIncludes> | ||
<CSWinRTWindowsMetadata>10.0.17763.0</CSWinRTWindowsMetadata> | ||
<WindowsSdkPackageVersion>10.0.17763.$(CsWinRTDependencyWindowsSdkVersionSuffixPackageVersion)</WindowsSdkPackageVersion> | ||
</PropertyGroup> | ||
|
||
<!-- Configure the release build binary to be as required by internal API scanning tools. --> | ||
<PropertyGroup Condition="'$(Configuration)'=='Release'"> | ||
<DebugType>pdbonly</DebugType> | ||
<DebugSymbols>true</DebugSymbols> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
<CsWinRTInputs Include="$(OutDir)/**/*.winmd" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<Reference Include="Microsoft.Windows.Security.AccessControl"> | ||
<HintPath>$(OutDir)..\WindowsAppRuntime_DLL\StrippedWinMD\Microsoft.Windows.Security.AccessControl.winmd</HintPath> | ||
<IsWinMDFile>true</IsWinMDFile> | ||
</Reference> | ||
</ItemGroup> | ||
|
||
</Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters