diff --git a/Microsoft.Maui.Graphics-net6.sln b/Microsoft.Maui.Graphics-net6.sln index 7de6f76..ae07333 100644 --- a/Microsoft.Maui.Graphics-net6.sln +++ b/Microsoft.Maui.Graphics-net6.sln @@ -15,8 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Graphics.Tex EndProject 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}" EndProject -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}" -EndProject +# 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}" +# EndProject 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}" EndProject 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 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable-net6", "samples\GraphicsTester.Portable\GraphicsTester.Portable-net6.csproj", "{F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}" -EndProject +# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android-net6", "samples\GraphicsTester.Android\GraphicsTester.Android-net6.csproj", "{95F0FD13-7376-4936-85A7-37F20AD94E8F}" +# EndProject +# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS-net6", "samples\GraphicsTester.iOS\GraphicsTester.iOS-net6.csproj", "{2B780F97-4C4E-432D-82DE-B591EBBE3FCB}" +# EndProject +# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac-net6", "samples\GraphicsTester.Mac\GraphicsTester.Mac-net6.csproj", "{093D3638-F133-46B0-AE23-D35D3FBFB6DD}" +# EndProject +# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst-net6", "samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst-net6.csproj", "{0B63725C-677E-43EE-ADD2-717CCD96DC23}" +# EndProject +# Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac-net6", "samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac-net6.csproj", "{883FB622-1BCB-437A-B20E-B5DBD3C53531}" +# EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -54,10 +54,10 @@ Global {B2776881-0ED3-45B4-92DF-EF90810A2507}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.ActiveCfg = Release|Any CPU {B2776881-0ED3-45B4-92DF-EF90810A2507}.Release|Any CPU.Build.0 = Release|Any CPU - {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU +# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {56EFCFA2-4520-4749-974E-6744A32B22D9}.Release|Any CPU.Build.0 = Release|Any CPU {FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA7FC7EB-E1EE-4136-A2B5-FEF56A072784}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -66,28 +66,28 @@ Global {F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D}.Release|Any CPU.Build.0 = Release|Any CPU - {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU - {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU - {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU - {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU - {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU - {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU +# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Debug|Any CPU.Deploy.0 = Debug|Any CPU +# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {95F0FD13-7376-4936-85A7-37F20AD94E8F}.Release|Any CPU.Build.0 = Release|Any CPU +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB}.Release|Any CPU.Build.0 = Release|Any CPU +# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {093D3638-F133-46B0-AE23-D35D3FBFB6DD}.Release|Any CPU.Build.0 = Release|Any CPU +# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {0B63725C-677E-43EE-ADD2-717CCD96DC23}.Release|Any CPU.Build.0 = Release|Any CPU +# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {883FB622-1BCB-437A-B20E-B5DBD3C53531}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -96,14 +96,14 @@ Global {E66999B3-9585-4EF3-A45C-97A2101AD612} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} {B364BA53-2BA8-4844-8BD2-CF257A3C21F1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} {B2776881-0ED3-45B4-92DF-EF90810A2507} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} - {56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} +# {56EFCFA2-4520-4749-974E-6744A32B22D9} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} {FA7FC7EB-E1EE-4136-A2B5-FEF56A072784} = {D6F0522F-3BB5-4A10-953F-CA047F3D881A} {F31ED3A3-A108-4D72-8EB1-4533AF6F5D8D} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} - {95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} - {2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} - {093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} - {0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} - {883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} +# {95F0FD13-7376-4936-85A7-37F20AD94E8F} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} +# {2B780F97-4C4E-432D-82DE-B591EBBE3FCB} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} +# {093D3638-F133-46B0-AE23-D35D3FBFB6DD} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} +# {0B63725C-677E-43EE-ADD2-717CCD96DC23} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} +# {883FB622-1BCB-437A-B20E-B5DBD3C53531} = {CE764F51-0699-4446-BEE2-17FBBDC99C5C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854} diff --git a/NuGet.config b/NuGet.config index c987d45..6fdcba2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,10 @@ + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b0a9176..544ba58 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -108,10 +108,16 @@ stages: - pwsh: | [xml] $fileXml = Get-Content "eng\Versions.props" $DotNetVersion = $fileXml.SelectSingleNode("Project/PropertyGroup/MicrosoftDotnetSdkInternalPackageVersion").InnerText - echo "Installing .NET $DotNetVersion" + $DotNetVersionBand = $fileXml.SelectSingleNode("Project/PropertyGroup/DotNetVersionBand").InnerText + echo "Installing .NET $DotNetVersion" Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1 & .\dotnet-install.ps1 -Version $DotNetVersion -InstallDir "$env:DOTNET_ROOT" -Verbose + + echo "Removing signing" + & "${env:ProgramFiles(x86)}\Windows Kits\10\App Certification Kit\signtool.exe" remove /s "$env:DOTNET_ROOT\sdk\$DotNetVersionBand\dotnet.dll" + + echo "Listing installed SDKs" & dotnet --list-sdks displayName: install .NET errorActionPreference: stop diff --git a/build/Build.Microsoft.Maui.Graphics.Windows.sln b/build/Build.Microsoft.Maui.Graphics.Windows.sln index 9156c86..c51c366 100644 --- a/build/Build.Microsoft.Maui.Graphics.Windows.sln +++ b/build/Build.Microsoft.Maui.Graphics.Windows.sln @@ -15,8 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Maui.Graphics.Win EndProject 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}" EndProject -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}" -EndProject +# 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}" +# EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,22 +93,22 @@ Global {98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x64.Build.0 = Release|Any CPU {98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.ActiveCfg = Release|Any CPU {98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F}.Release|x86.Build.0 = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU - {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|Any CPU.Build.0 = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.ActiveCfg = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|ARM.Build.0 = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.ActiveCfg = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x64.Build.0 = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.ActiveCfg = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Debug|x86.Build.0 = Debug|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.ActiveCfg = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|Any CPU.Build.0 = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.ActiveCfg = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|ARM.Build.0 = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.ActiveCfg = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x64.Build.0 = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.ActiveCfg = Release|Any CPU +# {6738582B-6246-486B-B90E-6C80799736B5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -118,7 +118,7 @@ Global {ED36FB6D-7278-465D-9C44-D01927258BA1} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} {20794E60-3BFD-46F4-BC0B-87B3959AA3C7} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} {98851CCB-2A9B-4FDE-8D2A-4F6139EA5A9F} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} - {6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} +# {6738582B-6246-486B-B90E-6C80799736B5} = {9E4B772B-D417-4147-B8B1-FD9E3B0B4EC5} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {0B07E734-6AE2-4A12-AD60-C072F3695854} diff --git a/build/DotNet/Dependencies/Workloads.csproj b/build/DotNet/Dependencies/Workloads.csproj index 1d2afc5..53ae536 100644 --- a/build/DotNet/Dependencies/Workloads.csproj +++ b/build/DotNet/Dependencies/Workloads.csproj @@ -8,7 +8,7 @@ - + diff --git a/build/Microsoft.Maui.Graphics.Skia.nuspec b/build/_Microsoft.Maui.Graphics.Skia.nuspec similarity index 100% rename from build/Microsoft.Maui.Graphics.Skia.nuspec rename to build/_Microsoft.Maui.Graphics.Skia.nuspec diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03744a1..776c0c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,36 +1,36 @@ - + https://github.com/dotnet/installer - e950d071463b02978f13d5324aeadd0eb9a51cfc + c506cfba13ac8861afdaaeadacb34fe7f54cde88 - + https://github.com/dotnet/runtime - 059caa278b1e5a62d0d60c9d84bdd737b04e6da8 + 6dd808ff7ae62512330d2f111eb1f60f1ae40125 - + https://github.com/xamarin/xamarin-android - 4a71aa6217dabc75b8616ee72440d85352868118 + 0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067 - + https://github.com/xamarin/xamarin-macios - aeabcf3b4db842dfb26c8634157e8417fe2364ee + 74d947e72f2ac04f605b0b4f1f2044c119f9b8c9 - + https://github.com/xamarin/xamarin-macios - aeabcf3b4db842dfb26c8634157e8417fe2364ee + 74d947e72f2ac04f605b0b4f1f2044c119f9b8c9 - + https://github.com/xamarin/xamarin-macios - aeabcf3b4db842dfb26c8634157e8417fe2364ee + 74d947e72f2ac04f605b0b4f1f2044c119f9b8c9 - + https://github.com/xamarin/xamarin-macios - aeabcf3b4db842dfb26c8634157e8417fe2364ee + 74d947e72f2ac04f605b0b4f1f2044c119f9b8c9 - + https://github.com/dotnet/emsdk - 1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a + ee0a97a0009c0e048789126253fea7994db676ac diff --git a/eng/Versions.props b/eng/Versions.props index 72ff11d..4d3d8fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,18 +2,20 @@ - 6.0.200-rtm.22078.8 + 6.0.200-rtm.22107.3 - 6.0.2-mauipre.1.22075.3 + 6.0.3 + + 6.0.2 - 31.0.200-preview.14.53 + 31.0.200-preview.14.95 - 15.2.300-preview.14.200 - 15.2.300-preview.14.200 - 12.1.300-preview.14.200 - 15.2.300-preview.14.200 + 15.2.302-preview.14.34 + 15.2.302-preview.14.34 + 12.1.302-preview.14.34 + 15.2.302-preview.14.34 - 6.0.0 + 6.0.2 6.0.100 @@ -22,5 +24,6 @@ 6.0.200 + 6.0.300