Skip to content

Commit 2320e20

Browse files
Bump to dotnet/installer@11f6b8f 7.0.100-rc.2.22459.2 (#7367)
Changes: dotnet/installer@dd355bb...11f6b8f Updates: * Microsoft.Dotnet.Sdk.Internal: from 7.0.100-rc.2.22457.6 to 7.0.100-rc.2.22459.2 ~~ Other Changes ~~ * Enable `$(DisableTransitiveFrameworkReferenceDownloads)` in `Directory.Build.targets` This transitive package restores for packs like `Microsoft.AspNetCore.App.Ref`. Otherwise we would need the 6.0.10 feed for ASP.NET Core packages. * Update the dotnet/runtime feed to `darc-pub-dotnet-runtime-8c6bcad`. This contains 6.0.10 runtime packages Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent 6290a9c commit 2320e20

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<RollForward>Major</RollForward>
2424
<!-- We don't need to be warned that we are using a preview .NET -->
2525
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
26+
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
27+
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
2628
</PropertyGroup>
2729

2830
<PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
1212
<!-- Added manually for dotnet/runtime 6.0.9 -->
1313
<add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-runtime-8c6bcad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8c6bcad1/nuget/v3/index.json" />
1515
</packageSources>
1616
<disabledPackageSources />
1717
</configuration>

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22457.6">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22459.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>dd355bb777249689beba30978ac26e15c96da642</Sha>
5+
<Sha>11f6b8f7129e34d5317f47ccbc110b2b11c05749</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22452.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22457.6</MicrosoftDotnetSdkInternalPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22459.2</MicrosoftDotnetSdkInternalPackageVersion>
55
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22452.1</MicrosoftNETILLinkTasksPackageVersion>
66
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22451.11</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public XASdkProject (string outputType = "Exe", [CallerMemberName] string packag
6363
SetProperty (KnownProperties.OutputType, outputType);
6464
SetProperty (KnownProperties.Nullable, "enable");
6565
SetProperty (KnownProperties.ImplicitUsings, "enable");
66+
// Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref
67+
SetProperty ("DisableTransitiveFrameworkReferenceDownloads", "true");
6668

6769
// Add relevant Android content to our project without writing it to the .csproj file
6870
if (outputType == "Exe") {

0 commit comments

Comments
 (0)