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

[net7.0] Update dependencies from xamarin/xamarin-android #11805

Merged
merged 28 commits into from
Feb 13, 2023
Merged

[net7.0] Update dependencies from xamarin/xamarin-android #11805

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
76df498
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Dec 1, 2022
c415029
Add --skip-sign-check to dotnet workload install
rmarinho Dec 12, 2022
bc59cd8
Only set R2R on WinExe
mattleibow Dec 12, 2022
65f654a
[build] Add more --skip-sign-check to install workloads for samples
rmarinho Dec 13, 2022
935cc79
Merge branch 'darc-net7.0-d26705c9-62b6-40ec-b2ce-fcb28e93993d' of ht…
rmarinho Dec 13, 2022
f96161d
Update Nuget.Config for runtime 6.0.12
rmarinho Dec 13, 2022
b2af7a2
Update Microsoft.Maui.Controls.SingleProject.props
mattleibow Dec 15, 2022
94e79c1
Update dotnet.cake
mattleibow Dec 15, 2022
f0c611d
Update dotnet.cake
mattleibow Dec 15, 2022
8eecfd7
Update dotnet.cake
mattleibow Dec 15, 2022
f980cc5
Update dotnet.cake
mattleibow Dec 15, 2022
7cac3f4
Update dotnet.cake
mattleibow Dec 15, 2022
06e9c32
Update dotnet.cake
mattleibow Dec 15, 2022
da855df
Merge remote-tracking branch 'origin/net7.0' into darc-net7.0-d26705c…
mattleibow Dec 15, 2022
7de3f38
revert hax
mattleibow Dec 15, 2022
d117686
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Dec 16, 2022
f3f84ec
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Dec 21, 2022
658638e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Dec 22, 2022
a0f0d9e
Merge branch 'net7.0' into darc-net7.0-d26705c9-62b6-40ec-b2ce-fcb28e…
rmarinho Jan 3, 2023
9b9b11e
Update feeds
rmarinho Jan 3, 2023
3c2a713
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jan 6, 2023
ee1c9d8
Merge remote-tracking branch 'origin/net7.0' into darc-net7.0-d26705c…
mattleibow Jan 27, 2023
ba3c11f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jan 27, 2023
cdf1f3c
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jan 27, 2023
00bf23b
Try fix build
rmarinho Feb 10, 2023
1a90210
Update NuGet.config
jonathanpeppers Feb 10, 2023
45f988a
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Feb 10, 2023
b92021d
Backport parts of f830ec0
jonathanpeppers Feb 11, 2023
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
1 change: 1 addition & 0 deletions .nuspec/Microsoft.Maui.Controls.SingleProject.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<WindowsAppSDKSelfContained Condition=" '$(WindowsAppSDKSelfContained)' == '' and '$(WindowsPackageType)' == 'None' and '$(OutputType)' == 'WinExe' ">true</WindowsAppSDKSelfContained>
<WindowsAppSdkBootstrapInitialize Condition=" '$(WindowsAppSdkBootstrapInitialize)' == '' and '$(EnableMsixTooling)' == 'true' and '$(OutputType)' != 'WinExe' ">false</WindowsAppSdkBootstrapInitialize>
<PublishAppXPackage Condition=" '$(PublishAppXPackage)' == '' and '$(EnableMsixTooling)' == 'true' and '$(WindowsPackageType)' == 'MSIX' ">true</PublishAppXPackage>
<!--<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' and '$(Configuration)' == 'Release' and '$(OutputType)' == 'WinExe' ">true</PublishReadyToRun>-->
<PublishReadyToRun Condition=" '$(Configuration)' == 'Release' and '$(PublishReadyToRun)' == '' ">true</PublishReadyToRun>
<_SingleProjectRIDRequired Condition="'$(OutputType)' == 'WinExe'">true</_SingleProjectRIDRequired>
<_SingleProjectRIDSpecified Condition="'$(RuntimeIdentifier)' != '' or '$(RuntimeIdentifiers)' != ''">true</_SingleProjectRIDSpecified>
Expand Down
6 changes: 3 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
<add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.11 -->
<add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.12 -->
<add key="darc-pub-dotnet-emsdk-851c377" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-851c3772/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-77f4e99" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-77f4e998/nuget/v3/index.json" />
</packageSources>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
Expand Down
22 changes: 11 additions & 11 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rtm.22519.39" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.101-servicing.22571.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e6dd91c290b808f971a1ac69c2fb29395bbf1051</Sha>
<Sha>d02d33e069bf59d00b6374e304d39d6ceb20e18a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rtm.22511.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d25158d0dffd699340cedcfd43324c87a809a214</Sha>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.4">
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.17">
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>8f1d9a47205ead80132661f68b0cee9ed0e0220b</Sha>
<Sha>2cd03f67964877613b104ed2dc13a7a2f4ebaefa</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.1.1478">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
Expand All @@ -28,13 +28,13 @@
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>ceb4326735ea1229055daec657092c1074ffebcd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
<Sha>6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rtm.22504.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>daca2015ce74956591df9c9dc7ee732af7863b42</Sha>
<Sha>6b7d1f47eaaa3f64c95e6f825c9e57debd4c0f31</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
<Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<!-- Current previous .NET SDK major version's stable release of MAUI packages -->
<MicrosoftMauiPreviousDotNetReleasedVersion>6.0.548</MicrosoftMauiPreviousDotNetReleasedVersion>
<!-- dotnet/installer -->
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rtm.22519.39</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>7.0.101-servicing.22571.1</MicrosoftDotnetSdkInternalPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can this be the public 7.0.101 now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason you'd use a nightly build like 7.0.101-servicing.22571.1, is so you can test changes before they ship.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right but for example this failed to build and get merged before the servicing coming out.. we should have been able to test this earlier or get more people trying to fix the issues.

also if I change to 7.0.101 it doesn't install, can't find it ..

Copy link
Member

@jonathanpeppers jonathanpeppers Dec 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

./dotnet-install.sh --version 7.0.101 won't work for stable builds. You'd have to use ./dotnet-install.sh --channel 7.0.1xx --quality ga.

<!-- dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rtm.22511.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0</MicrosoftNETCoreAppRefPackageVersion>
<!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
<MicrosoftExtensionsPackageVersion>7.0.0</MicrosoftExtensionsPackageVersion>
<MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.4</MicrosoftAndroidSdkWindowsPackageVersion>
<MicrosoftAndroidSdkWindowsPackageVersion>33.0.17</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdkPackageVersion>16.1.1478</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.0.2033</MicrosoftmacOSSdkPackageVersion>
Expand All @@ -20,7 +20,7 @@
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.100</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rtm.22504.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<!-- wasdk -->
<MicrosoftWindowsAppSDKPackageVersion>1.2.221109.1</MicrosoftWindowsAppSDKPackageVersion>
Expand Down
13 changes: 10 additions & 3 deletions eng/cake/dotnet.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ Task("dotnet-templates")
"</TargetFrameworks>");

// Build
RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild);
RunMSBuildWithDotNet(projectName, properties, warningsAsError: true, forceDotNetBuild: forceDotNetBuild, onlyPreprocess: true);

// Pack
if (alsoPack.Contains(templateName)) {
Expand Down Expand Up @@ -599,7 +599,8 @@ void RunMSBuildWithDotNet(
bool restore = true,
string targetFramework = null,
bool forceDotNetBuild = false,
int maxCpuCount = 0)
int maxCpuCount = 0,
bool onlyPreprocess = false)
{
var useDotNetBuild = forceDotNetBuild || !IsRunningOnWindows() || target == "Run";

Expand All @@ -608,11 +609,14 @@ void RunMSBuildWithDotNet(
var binlog = string.IsNullOrEmpty(targetFramework) ?
$"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.binlog\"" :
$"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.binlog\"";
var pp = string.IsNullOrEmpty(targetFramework) ?
$"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{type}.pp.txt\"" :
$"\"{GetLogDirectory()}/{name}-{configuration}-{target}-{targetFramework}-{type}.pp.txt\"";

if(localDotnet)
SetDotNetEnvironmentVariables();

var msbuildSettings = new DotNetCoreMSBuildSettings()
var msbuildSettings = new DotNetCoreMSBuildSettings();
.SetConfiguration(configuration)
.SetMaxCpuCount(maxCpuCount)
.WithTarget(target)
Expand Down Expand Up @@ -644,6 +648,9 @@ void RunMSBuildWithDotNet(
if (!string.IsNullOrEmpty(targetFramework))
args.Append($"-f {targetFramework}");

if (onlyPreprocess)
args.Append($"-pp=\"{pp}\"");

return args;
};

Expand Down
4 changes: 2 additions & 2 deletions src/DotNet/DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</ItemGroup>
<Copy SourceFiles="$(MauiRootDirectory)NuGet.config" DestinationFolder="$(DotNetTempDirectory)" />
<Exec Command="dotnet nuget add source &quot;$(PackageOutputPath)&quot; --name artifacts --configfile &quot;$(DotNetTempDirectory)NuGet.config&quot;" />
<Exec Command="&quot;$(MSBuildExtensionsPath)../../dotnet&quot; workload install tizen maui --skip-manifest-update --verbosity diag --temp-dir &quot;$(DotNetTempDirectory)&quot; --configfile &quot;$(DotNetTempDirectory)NuGet.config&quot;" WorkingDirectory="$(MauiRootDirectory)" />
<Exec Command="&quot;$(MSBuildExtensionsPath)../../dotnet&quot; workload install tizen maui --skip-sign-check --skip-manifest-update --verbosity diag --temp-dir &quot;$(DotNetTempDirectory)&quot; --configfile &quot;$(DotNetTempDirectory)NuGet.config&quot;" WorkingDirectory="$(MauiRootDirectory)" />

</Target>

Expand Down Expand Up @@ -168,7 +168,7 @@
Inputs="$(_Inputs)"
Outputs="$(DotNetPacksDirectory).stamp">
<Exec
Command="&quot;$(DotNetToolPath)&quot; workload install %(_WorkloadIds.Identity) --skip-manifest-update --verbosity diag --temp-dir &quot;$(DotNetTempDirectory)&quot; --configfile &quot;$(MauiRootDirectory)NuGet.config&quot;"
Command="&quot;$(DotNetToolPath)&quot; workload install %(_WorkloadIds.Identity) --skip-sign-check --skip-manifest-update --verbosity diag --temp-dir &quot;$(DotNetTempDirectory)&quot; --configfile &quot;$(MauiRootDirectory)NuGet.config&quot;"
WorkingDirectory="$(MauiRootDirectory)"
EnvironmentVariables="DOTNET_MULTILEVEL_LOOKUP=0"
/>
Expand Down