[main] Update dependencies from xamarin/xamarin-android (#312)
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220207.42 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.217 * Update dependencies from https://github.com/xamarin/xamarin-android build main-4342afd8dc89202bb501d0552a7945fbed8101d3-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.57 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22106.1 (parent: Microsoft.Android.Sdk.Windows * Remove emsdk explicit version * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220208.27 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.235 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220209.36 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.244 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220210.25 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.249 * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220211.24 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.252 * Update dependencies from https://github.com/xamarin/xamarin-android build main-f9892cc8e63f6990ef4e4c426dde66a84d0d3816-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.74 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220214.17 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.254 * Update dependencies from https://github.com/xamarin/xamarin-android build main-ee4322054292a8f6e33ca6c53fe9ce609fce3c95-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.77 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220215.73 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.5 * Update dependencies from https://github.com/xamarin/xamarin-android build main-db56e3877069a5c519f61a0b1722726f890c77a6-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.84 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220216.36 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.18 * Update dependencies from https://github.com/xamarin/xamarin-android build main-25e0eefbd20bb4778a4717e4ef587a080c82bca0-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.89 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-android build main-ebdd4b826cc208202ac1793484cad2fe0036abc2-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.91 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-android build main-d73e048af287b32c69d825191337927081bf8d3c-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.93 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Update dependencies from https://github.com/xamarin/xamarin-macios build 20220219.1 Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.34 * Update dependencies from https://github.com/xamarin/xamarin-android build main-0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.95 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Bump iOS, bring back emsdk * try removing the signing until we can build * try get things to run * 🕵🏼 * wrong thing * and vs again * wrong files * build all again * Update dependencies from https://github.com/xamarin/xamarin-android build main-0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067-1 Microsoft.Android.Sdk.Windows From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.95 Dependency coherency updates Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows * Try this way * And this one * moar * asdf * asdf * asdf * try params * asdf * asdf * asdf * sadf * asdf * :( * asdf Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: redth <jondick@gmail.com> Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
7e0a574089
Коммит
b217554b1c
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,10 @@
|
|||
<clear />
|
||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||
<!-- Begin: Package sources from dotnet-emsdk -->
|
||||
<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" />
|
||||
<!-- End: Package sources from dotnet-emsdk -->
|
||||
<!-- Begin: Package sources from dotnet-runtime -->
|
||||
<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" />
|
||||
<!-- End: Package sources from dotnet-runtime -->
|
||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetVersionBandMonoToolchain)" Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(DotNetVersionBandEmscripten)" Version="[$(MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(DotNetVersionBandEmscripten)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(DotNetVersionBandAndroid)" Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(DotNetVersionBandApple)" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
|
||||
<PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(DotNetVersionBandApple)" Version="[$(MicrosoftiOSSdkPackageVersion)]" />
|
||||
|
|
|
|||
|
|
@ -1,36 +1,36 @@
|
|||
<Dependencies>
|
||||
<ProductDependencies>
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-rtm.22078.8" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
|
||||
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.200-rtm.22107.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
|
||||
<Uri>https://github.com/dotnet/installer</Uri>
|
||||
<Sha>e950d071463b02978f13d5324aeadd0eb9a51cfc</Sha>
|
||||
<Sha>c506cfba13ac8861afdaaeadacb34fe7f54cde88</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.2-mauipre.1.22075.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.3" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>059caa278b1e5a62d0d60c9d84bdd737b04e6da8</Sha>
|
||||
<Sha>6dd808ff7ae62512330d2f111eb1f60f1ae40125</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.14.53">
|
||||
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="31.0.200-preview.14.95">
|
||||
<Uri>https://github.com/xamarin/xamarin-android</Uri>
|
||||
<Sha>4a71aa6217dabc75b8616ee72440d85352868118</Sha>
|
||||
<Sha>0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.300-preview.14.200">
|
||||
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.2.302-preview.14.34">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>aeabcf3b4db842dfb26c8634157e8417fe2364ee</Sha>
|
||||
<Sha>74d947e72f2ac04f605b0b4f1f2044c119f9b8c9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.iOS.Sdk" Version="15.2.300-preview.14.200">
|
||||
<Dependency Name="Microsoft.iOS.Sdk" Version="15.2.302-preview.14.34">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>aeabcf3b4db842dfb26c8634157e8417fe2364ee</Sha>
|
||||
<Sha>74d947e72f2ac04f605b0b4f1f2044c119f9b8c9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.2.300-preview.14.200">
|
||||
<Dependency Name="Microsoft.tvOS.Sdk" Version="15.2.302-preview.14.34">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>aeabcf3b4db842dfb26c8634157e8417fe2364ee</Sha>
|
||||
<Sha>74d947e72f2ac04f605b0b4f1f2044c119f9b8c9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.macOS.Sdk" Version="12.1.300-preview.14.200">
|
||||
<Dependency Name="Microsoft.macOS.Sdk" Version="12.1.302-preview.14.34">
|
||||
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
|
||||
<Sha>aeabcf3b4db842dfb26c8634157e8417fe2364ee</Sha>
|
||||
<Sha>74d947e72f2ac04f605b0b4f1f2044c119f9b8c9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
|
||||
<Uri>https://github.com/dotnet/emsdk</Uri>
|
||||
<Sha>1ec2e17fcfd86bdd6f7e7246b6d527e94e34c15a</Sha>
|
||||
<Sha>ee0a97a0009c0e048789126253fea7994db676ac</Sha>
|
||||
</Dependency>
|
||||
</ProductDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -2,18 +2,20 @@
|
|||
<!--Package versions-->
|
||||
<PropertyGroup>
|
||||
<!-- dotnet/installer -->
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-rtm.22078.8</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<MicrosoftDotnetSdkInternalPackageVersion>6.0.200-rtm.22107.3</MicrosoftDotnetSdkInternalPackageVersion>
|
||||
<!-- dotnet/runtime -->
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.2-mauipre.1.22075.3</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>6.0.3</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<!-- dotnet/emsdk -->
|
||||
<MicrosoftNETWorkloadEmscriptenPackageVersion>6.0.2</MicrosoftNETWorkloadEmscriptenPackageVersion>
|
||||
<!-- xamarin/xamarin-android -->
|
||||
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.14.53</MicrosoftAndroidSdkWindowsPackageVersion>
|
||||
<MicrosoftAndroidSdkWindowsPackageVersion>31.0.200-preview.14.95</MicrosoftAndroidSdkWindowsPackageVersion>
|
||||
<!-- xamarin/xamarin-macios -->
|
||||
<MicrosoftiOSSdkPackageVersion>15.2.300-preview.14.200</MicrosoftiOSSdkPackageVersion>
|
||||
<MicrosoftMacCatalystSdkPackageVersion>15.2.300-preview.14.200</MicrosoftMacCatalystSdkPackageVersion>
|
||||
<MicrosoftmacOSSdkPackageVersion>12.1.300-preview.14.200</MicrosoftmacOSSdkPackageVersion>
|
||||
<MicrosofttvOSSdkPackageVersion>15.2.300-preview.14.200</MicrosofttvOSSdkPackageVersion>
|
||||
<MicrosoftiOSSdkPackageVersion>15.2.302-preview.14.34</MicrosoftiOSSdkPackageVersion>
|
||||
<MicrosoftMacCatalystSdkPackageVersion>15.2.302-preview.14.34</MicrosoftMacCatalystSdkPackageVersion>
|
||||
<MicrosoftmacOSSdkPackageVersion>12.1.302-preview.14.34</MicrosoftmacOSSdkPackageVersion>
|
||||
<MicrosofttvOSSdkPackageVersion>15.2.302-preview.14.34</MicrosofttvOSSdkPackageVersion>
|
||||
<!-- emsdk -->
|
||||
<MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.0</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
|
||||
<MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>6.0.2</MicrosoftNETWorkloadEmscriptenManifest60100PackageVersion>
|
||||
<!-- <DotNetVersionBandMonoToolchain></DotNetVersionBandMonoToolchain> -->
|
||||
<DotNetVersionBandEmscripten>6.0.100</DotNetVersionBandEmscripten>
|
||||
<!-- <DotNetVersionBandAndroid></DotNetVersionBandAndroid> -->
|
||||
|
|
@ -22,5 +24,6 @@
|
|||
<PropertyGroup>
|
||||
<!-- NOTE: temporarily hardcode 6.0.100, until we have new branding on dotnet/runtime packs -->
|
||||
<DotNetVersionBand Condition=" '$(DotNetVersionBand)' == '' ">6.0.200</DotNetVersionBand>
|
||||
<DotNetVersionBandApple>6.0.300</DotNetVersionBandApple>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче