Skip to content

Commit 2a6da61

Browse files
dkbennettdkbennett
committed
Merge branch 'master' into disablesource
2 parents f231adc + 0f649f3 commit 2a6da61

File tree

56 files changed

+925
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+925
-342
lines changed

‎.github/actions/spelling/expect.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ auxdata
4646
awgpm
4747
awgs
4848
azurewebsites
49+
bak
4950
Baz
5051
bbb
5152
bcp
@@ -160,6 +161,7 @@ ERRORONEXIT
160161
errstr
161162
ESRB
162163
etl
164+
evtx
163165
ewgp
164166
ewgs
165167
execustom
@@ -322,6 +324,7 @@ MBH
322324
MBs
323325
mday
324326
mdmp
327+
mdmpto
325328
MDs
326329
megamorf
327330
microsoftentraid
@@ -605,14 +608,15 @@ website
605608
wesome
606609
wfsopen
607610
wgetenv
608-
Whatif
611+
whatif
609612
WIC
610613
wildcards
611614
WINAPI
612615
wincodec
613616
windir
614617
windowsdeveloper
615618
winerror
619+
winevt
616620
wingdi
617621
wingetconfigroot
618622
wingetcreate

‎CODEOWNERS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
* @microsoft/windows-package-manager-admins
1+
* @microsoft/winget-developers
2+

‎azure-pipelines.yml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ jobs:
340340
341341
- pwsh: |
342342
$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
343-
PsExec -accepteula -s -i $(buildOutDir)\AppInstallerCLITests\AppInstallerCLITests.exe -logto $(artifactsDir)\AICLI-Unpackaged-System.log -s -r junit -o $(artifactsDir)\TEST-AppInstallerCLI-Unpackaged-System.xml
343+
PsExec -accepteula -s -i $(buildOutDir)\AppInstallerCLITests\AppInstallerCLITests.exe -logto $(artifactsDir)\AICLI-Unpackaged-System.log -mdmpto $(artifactsDir)\AICLI-Unpackaged-System.mdmp -s -r junit -o $(artifactsDir)\TEST-AppInstallerCLI-Unpackaged-System.xml
344344
displayName: Run Unit Tests Unpackaged Under System Context
345345
workingDirectory: '$(buildOutDir)\AppInstallerCLITests'
346346
condition: succeededOrFailed()
@@ -354,7 +354,7 @@ jobs:
354354
displayName: Run Unit Tests Packaged
355355
inputs:
356356
filePath: 'src\AppInstallerCLITests\Run-TestsInPackage.ps1'
357-
arguments: '-Args "~[pips]" -BuildRoot $(buildOutDir) -PackageRoot $(packageLayoutDir) -LogTarget $(artifactsDir)\AICLI-Packaged.log -TestResultsTarget $(artifactsDir)\TEST-AppInstallerCLI-Packaged.xml -ScriptWait'
357+
arguments: '-Args "~[pips]" -BuildRoot $(buildOutDir) -PackageRoot $(packageLayoutDir) -LogTarget $(artifactsDir)\AICLI-Packaged.log -MdmpTarget $(artifactsDir)\AICLI-Packaged.mdmp -TestResultsTarget $(artifactsDir)\TEST-AppInstallerCLI-Packaged.xml -ScriptWait'
358358
workingDirectory: 'src'
359359
condition: succeededOrFailed()
360360

@@ -482,6 +482,34 @@ jobs:
482482
- powershell: Get-Process LocalhostWebServer | Stop-Process
483483
displayName: Stop LocalhostWebServer
484484
condition: succeededOrFailed()
485+
486+
- task: PowerShell@2
487+
displayName: 'Copy GA WinGet Log to artifacts folder'
488+
inputs:
489+
targetType: 'inline'
490+
script: |
491+
$source = "$env:LocalAppData\Packages\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe\LocalState\DiagOutputDir"
492+
$destination = "$(artifactsDir)\GA_WinGet_Logs"
493+
if (Test-Path $source) {
494+
Copy-Item -Path $source -Destination $destination -Recurse -Force
495+
} else {
496+
Write-Host "WinGet logs not found at $source"
497+
}
498+
condition: succeededOrFailed()
499+
500+
- task: PowerShell@2
501+
displayName: 'Copy Application Event Logs to Artifacts'
502+
inputs:
503+
targetType: 'inline'
504+
script: |
505+
$source = "$env:SystemRoot\System32\winevt\Logs\Application.evtx"
506+
$destination = "$(artifactsDir)\Application.evtx"
507+
if (Test-Path $source) {
508+
Copy-Item -Path $source -Destination $destination -Force
509+
} else {
510+
Write-Host "Application event log not found at $source"
511+
}
512+
condition: succeededOrFailed()
485513

486514
- task: PublishPipelineArtifact@1
487515
displayName: Publish Pipeline Artifacts

‎samples/MinimalCallers/C++/WinGet-InProc/WinGet-InProc.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3939
<PropertyGroup Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
41-
<PlatformToolset>v143</PlatformToolset>
42-
<CharacterSet>Unicode</CharacterSet>
4341
</PropertyGroup>
4442
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
4543
<UseDebugLibraries>true</UseDebugLibraries>

‎samples/MinimalCallers/C++/WinGet-OutOfProc/WinGet-OutOfProc.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3939
<PropertyGroup Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
41-
<PlatformToolset>v143</PlatformToolset>
42-
<CharacterSet>Unicode</CharacterSet>
4341
</PropertyGroup>
4442
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
4543
<UseDebugLibraries>true</UseDebugLibraries>

‎samples/WinGetUWPCaller/WinGetUWPCaller/WinGetUWPCaller.vcxproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@
4646
</ItemGroup>
4747
<PropertyGroup Label="Configuration">
4848
<ConfigurationType>Application</ConfigurationType>
49-
<PlatformToolset>v140</PlatformToolset>
50-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
51-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
52-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
53-
<CharacterSet>Unicode</CharacterSet>
5449
</PropertyGroup>
5550
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
5651
<UseDebugLibraries>true</UseDebugLibraries>

‎src/AppInstallerCLI.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project", "Project", "{8D53
3838
..\azure-pipelines.yml = ..\azure-pipelines.yml
3939
..\cgmanifest.json = ..\cgmanifest.json
4040
Directory.Build.props = Directory.Build.props
41+
Get-VcxprojNugetPackageVersions.ps1 = Get-VcxprojNugetPackageVersions.ps1
4142
..\README.md = ..\README.md
4243
..\doc\ReleaseNotes.md = ..\doc\ReleaseNotes.md
4344
..\doc\Settings.md = ..\doc\Settings.md
45+
Update-VcxprojNugetPackageVersions.ps1 = Update-VcxprojNugetPackageVersions.ps1
4446
..\WinGetInProcCom.nuspec = ..\WinGetInProcCom.nuspec
4547
..\WinGetUtil.nuspec = ..\WinGetUtil.nuspec
4648
EndProjectSection

‎src/AppInstallerCLI/AppInstallerCLI.vcxproj‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
3+
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<PropertyGroup Label="Globals">
55
<CppWinRTOptimized>true</CppWinRTOptimized>
66
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -42,11 +42,6 @@
4242
</ItemGroup>
4343
<PropertyGroup Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
45-
<PlatformToolset>v140</PlatformToolset>
46-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
47-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
48-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
49-
<CharacterSet>Unicode</CharacterSet>
5045
</PropertyGroup>
5146
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
5247
<UseDebugLibraries>true</UseDebugLibraries>
@@ -252,13 +247,13 @@
252247
</ItemGroup>
253248
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
254249
<ImportGroup Label="ExtensionTargets">
255-
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
250+
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
256251
</ImportGroup>
257252
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
258253
<PropertyGroup>
259254
<ErrorText>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}.</ErrorText>
260255
</PropertyGroup>
261-
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
262-
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
256+
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
257+
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
263258
</Target>
264-
</Project>
259+
</Project>

‎src/AppInstallerCLI/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
3+
<package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
44
</packages>

‎src/AppInstallerCLICore/AppInstallerCLICore.vcxproj‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
3+
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<PropertyGroup Label="Globals">
55
<CppWinRTOptimized>true</CppWinRTOptimized>
66
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -54,11 +54,6 @@
5454
</ItemGroup>
5555
<PropertyGroup Label="Configuration">
5656
<ConfigurationType>StaticLibrary</ConfigurationType>
57-
<PlatformToolset>v140</PlatformToolset>
58-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '15.0'">v141</PlatformToolset>
59-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
60-
<PlatformToolset Condition="'$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
61-
<CharacterSet>Unicode</CharacterSet>
6257
</PropertyGroup>
6358
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
6459
<UseDebugLibraries>true</UseDebugLibraries>
@@ -482,15 +477,16 @@
482477
</ItemGroup>
483478
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
484479
<ImportGroup Label="ExtensionTargets">
485-
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
486-
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
480+
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
481+
<Import Project="$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
487482
</ImportGroup>
488483
<Target Name="EnsureBuildImports" BeforeTargets="PrepareForBuild">
489484
<PropertyGroup>
490485
<ErrorTextNuget>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}.</ErrorTextNuget>
491486
</PropertyGroup>
492-
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.231028.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
493-
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
494-
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
487+
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.ImplementationLibrary.1.0.250325.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
488+
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
489+
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorTextNuget)', '$(SolutionDir)\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
495490
</Target>
496-
</Project>
491+
</Project>
492+

0 commit comments

Comments
 (0)