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

Convert to using CsWin32 HRESULT definition #10155

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Convert to using CsWin32 HRESULT definition #10155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions Microsoft.Dotnet.Wpf.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Primitives-r
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PresentationFramework.Fluent.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\PresentationFramework.Fluent.Tests\PresentationFramework.Fluent.Tests.csproj", "{56833D74-2D0B-5516-C1D6-B93D4FFF7612}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Primitives.Tests", "src\Microsoft.DotNet.Wpf\tests\UnitTests\System.Windows.Primitives.Tests\System.Windows.Primitives.Tests.csproj", "{88CF4EED-8617-D414-D538-A7DE83E7780C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|arm64 = Debug|arm64
Expand Down Expand Up @@ -1653,6 +1655,18 @@ Global
{56833D74-2D0B-5516-C1D6-B93D4FFF7612}.Release|x64.Build.0 = Release|x64
{56833D74-2D0B-5516-C1D6-B93D4FFF7612}.Release|x86.ActiveCfg = Release|x86
{56833D74-2D0B-5516-C1D6-B93D4FFF7612}.Release|x86.Build.0 = Release|x86
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|arm64.ActiveCfg = Debug|arm64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|arm64.Build.0 = Debug|arm64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|x64.ActiveCfg = Debug|x64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|x64.Build.0 = Debug|x64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|x86.ActiveCfg = Debug|x86
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Debug|x86.Build.0 = Debug|x86
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|arm64.ActiveCfg = Release|arm64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|arm64.Build.0 = Release|arm64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|x64.ActiveCfg = Release|x64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|x64.Build.0 = Release|x64
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|x86.ActiveCfg = Release|x86
{88CF4EED-8617-D414-D538-A7DE83E7780C}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1780,6 +1794,7 @@ Global
{5306FA93-178C-4535-ADEE-86B1DE1B68CB} = {2EE4A2DA-70B3-4767-9D18-618DA0FE3105}
{0EFFC7C4-B486-4852-8CED-EDEB46E02C42} = {D0AED517-9972-41CB-8751-983E4EB8F511}
{56833D74-2D0B-5516-C1D6-B93D4FFF7612} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
{88CF4EED-8617-D414-D538-A7DE83E7780C} = {A48B585E-6AB0-4F8D-8484-77F37CB44437}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B4340004-DAC0-497D-B69D-CFA7CD93F567}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ function InstallDotNet([string] $dotnetRoot,
$dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'"

if (Test-Path $runtimePath) {
Write-Host " Runtime toolset '$runtime/$architecture v$version' already installed."
Write-Host " Runtime toolset '$runtime/$architecture v$version' already installed at '$runtimePath'."
$installSuccess = $true
Exit
}
Expand Down
6 changes: 5 additions & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"tools": {
"dotnet": "10.0.100-alpha.1.24573.1",
"runtimes": {
"dotnet": [
"dotnet/x64": [
"2.1.7",
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
],
"dotnet/x86": [
"2.1.7",
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
]
Expand Down
Loading