Skip to content
This repository was archived by the owner on Dec 21, 2023. It is now read-only.

Commit e7bbd82

Browse files
jsuarezruizjsuarezruiz
committed
Merge branch 'main' into rename-rectangle
2 parents 1724f57 + 4e7630c commit e7bbd82

File tree

8 files changed

+101
-90
lines changed

8 files changed

+101
-90
lines changed

‎Microsoft.Maui.Graphics-net6.sln‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Tex
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6", "src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop-net6.csproj", "{B2776881-0ED3-45B4-92DF-EF90810A2507}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia-net6", "src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia-net6.csproj", "{56EFCFA2-4520-4749-974E-6744A32B22D9}"
19-
EndProject
18+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia-net6", "src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia-net6.csproj", "{56EFCFA2-4520-4749-974E-6744A32B22D9}"
19+
# EndProject
2020
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Tests-net6", "tests\Microsoft.Maui.Graphics.Tests\Microsoft.Maui.Graphics.Tests-net6.csproj", "{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}"
2121
EndProject
2222
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BC96F35C-D92C-404E-8615-AC15A6E62205}"
@@ -26,16 +26,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable-net6", "samples\GraphicsTester.Portable\GraphicsTester.Portable-net6.csproj", "{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}"
2828
EndProject
29-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}"
30-
EndProject
31-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}"
32-
EndProject
33-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}"
34-
EndProject
35-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}"
36-
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}"
38-
EndProject
29+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}"
30+
# EndProject
31+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}"
32+
# EndProject
33+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}"
34+
# EndProject
35+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}"
36+
# EndProject
37+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}"
38+
# EndProject
3939
Global
4040
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4141
Debug|Any CPU = Debug|Any CPU
@@ -54,10 +54,10 @@ Global
5454
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Debug|Any CPU.Build.0 = Debug|Any CPU
5555
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.ActiveCfg = Release|Any CPU
5656
{B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
60-
{56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU
57+
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU
6161
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6262
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.Build.0 = Debug|Any CPU
6363
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,28 +66,28 @@ Global
6666
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
6767
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
6868
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
72-
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
73-
{95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU
74-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
76-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
77-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
81-
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU
83-
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84-
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
85-
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
86-
{0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU
87-
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88-
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU
89-
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU
90-
{883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU
69+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
71+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
72+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU
74+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
77+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
78+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU
79+
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
82+
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU
83+
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
85+
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
86+
# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU
87+
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88+
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU
89+
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU
9191
EndGlobalSection
9292
GlobalSection(SolutionProperties) = preSolution
9393
HideSolutionNode = FALSE
@@ -96,14 +96,14 @@ Global
9696
{E66999B3-9585-4EF3-A45C-97A2101AD612} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
9797
{B364BA53-2BA8-4844-8BD2-CF257A3C21F1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
9898
{B2776881-0ED3-45B4-92DF-EF90810A2507} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
99-
{56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
99+
# {56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
100100
{FA7FC7EB-E1EE-4136-A2B5-FEF56A072784} = {D6F0522F-3BB5-4A10-953F-CA047F3D881A}
101101
{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
102-
{95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
103-
{2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
104-
{093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
105-
{0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
106-
{883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
102+
# {95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
103+
# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
104+
# {093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
105+
# {0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
106+
# {883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C}
107107
EndGlobalSection
108108
GlobalSection(ExtensibilityGlobals) = postSolution
109109
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7+
<add key="darc-pub-dotnet-emsdk-ee0a97a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ee0a97a0/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-emsdk -->
89
<!-- Begin: Package sources from dotnet-runtime -->
10+
<add key="darc-pub-dotnet-runtime-6dd808f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6dd808ff-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-runtime -->
1012
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1113
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />

‎azure-pipelines.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,16 @@ stages:
108108
- pwsh: |
109109
[xml] $fileXml = Get-Content "eng\Versions.props"
110110
$DotNetVersion = $fileXml.SelectSingleNode("Project/PropertyGroup/MicrosoftDotnetSdkInternalPackageVersion").InnerText
111-
echo "Installing .NET $DotNetVersion"
111+
$DotNetVersionBand = $fileXml.SelectSingleNode("Project/PropertyGroup/DotNetVersionBand").InnerText
112112
113+
echo "Installing .NET $DotNetVersion"
113114
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
114115
& .\dotnet-install.ps1 -Version $DotNetVersion -InstallDir "$env:DOTNET_ROOT" -Verbose
116+
117+
echo "Removing signing"
118+
& "${env:ProgramFiles(x86)}\Windows Kits\10\App Certification Kit\signtool.exe" remove /s "$env:DOTNET_ROOT\sdk\$DotNetVersionBand\dotnet.dll"
119+
120+
echo "Listing installed SDKs"
115121
& dotnet --list-sdks
116122
displayName: install .NET
117123
errorActionPreference: stop
@@ -206,7 +212,7 @@ stages:
206212
${{ if variables['signingCondition'] }}:
207213
dependsOn: [ 'nuget_signing' ]
208214
jobs:
209-
- template: compliance/sbom/job.v1.yml@internal-templates
215+
- template: compliance/sbom/job.v1.yml@xamarin-templates
210216
parameters:
211217
artifactNames: ['nuget']
212218
${{ if variables['signingCondition'] }}:

‎build/Build.Microsoft.Maui.Graphics.Windows.sln‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Maui.Graphics.Win
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Win2D.WinUI.Desktop", "..\src\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop\Microsoft.Maui.Graphics.Win2D.WinUI.Desktop.csproj", "{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}"
1717
EndProject
18-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia", "..\src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia.csproj", "{6738582B-6246-486B-B90E-6C80799736B5}"
19-
EndProject
18+
# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Skia", "..\src\Microsoft.Maui.Graphics.Skia\Microsoft.Maui.Graphics.Skia.csproj", "{6738582B-6246-486B-B90E-6C80799736B5}"
19+
# EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2222
Debug|Any CPU = Debug|Any CPU
@@ -93,22 +93,22 @@ Global
9393
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x64.Build.0 = Release|Any CPU
9494
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.ActiveCfg = Release|Any CPU
9595
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.Build.0 = Release|Any CPU
96-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
98-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
99-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU
100-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU
101-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU
102-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU
103-
{6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU
104-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
105-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU
106-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU
107-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU
108-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU
109-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU
110-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU
111-
{6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU
96+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
97+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
98+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU
99+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU
100+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU
101+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU
102+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU
103+
# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU
104+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
105+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU
106+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU
107+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU
108+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU
109+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU
110+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU
111+
# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU
112112
EndGlobalSection
113113
GlobalSection(SolutionProperties) = preSolution
114114
HideSolutionNode = FALSE
@@ -118,7 +118,7 @@ Global
118118
{ED36FB6D-7278-465D-9C44-D01927258BA1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
119119
{20794E60-3BFD-46F4-BC0B-87B3959AA3C7} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
120120
{98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
121-
{6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
121+
# {6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5}
122122
EndGlobalSection
123123
GlobalSection(ExtensibilityGlobals) = postSolution
124124
SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854}

‎build/DotNet/Dependencies/Workloads.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetVersionBandMonoToolchain)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
11-
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(DotNetVersionBandEmscripten)" Version="[$(MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion)]" />
11+
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(DotNetVersionBandEmscripten)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
1212
<PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(DotNetVersionBandAndroid)" Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
1313
<PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(DotNetVersionBandApple)" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
1414
<PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(DotNetVersionBandApple)" Version="[$(MicrosoftiOSSdkPackageVersion)]" />

build/Microsoft.Maui.Graphics.Skia.nuspec renamed to build/_Microsoft.Maui.Graphics.Skia.nuspec

File renamed without changes.

0 commit comments

Comments
 (0)