Skip to content

[release/8.0.1xx-rc2] Update dependencies from dotnet/installer #8360

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

Jump to bottom
Merged
merged 19 commits into from
Sep 26, 2023
Merged

[release/8.0.1xx-rc2] Update dependencies from dotnet/installer #8360

merged 19 commits into from
Sep 26, 2023

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Sep 21, 2023 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/installer

  • Subscription: 5a31171c-9ff7-4c89-f242-08dbb9cc78f2
  • Build: 20230922.8
  • Date Produced: September 22, 2023 8:15:50 PM UTC
  • Commit: e13fd5c19e383f99132b1bfd2496857db089b680
  • Branch: refs/heads/release/8.0.1xx-rc2

@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
211c377 
…230921.16

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23471.16
dotnet-maestro bot and others added 16 commits September 22, 2023 12:28
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
ba2d6fc 
…230921.16

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23471.16
@jonathanpeppers
dotnet/runtime 7.0.12
bf8a633
@jonathanpeppers
dotnet/runtime 6.0.23
0f1f440
@jonathanpeppers
Pass -p:RestoreConfigFile to Java.Interop.sln
1f8a122
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
f8d2c17 
…230922.8

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
f0ddfdc 
…230922.8

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8
@jonathanpeppers
Bump to xamarin/monodroid@6c16fb50
80e6fd1 
Changes: xamarin/monodroid@8908d6a...6c16fb5
@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
fdeac57 
…230922.8

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-rc.2.23468.1 -> To Version 8.0.100-rc.2.23472.8
@jonathanpeppers
Merge branch 'release/8.0.1xx-rc2' into darc-release/8.0.1xx-rc2-9f11…
6976437 
…27c7-556a-4026-bbf6-0ccb630b6fcf
@jonathanpeppers
Pass -p:RestoreConfigFile more places
4c2861e
@jonathanpeppers
Revert "Pass -p:RestoreConfigFile more places"
ecd90af 
This reverts commit 4c2861e.
@jonathanpeppers
Revert "Pass -p:RestoreConfigFile to Java.Interop.sln"
2c29c65 
This reverts commit 1f8a122.
@jonathanpeppers
Try $(RestoreConfigFile) in *.override.props
f875c3d
@jonathanpeppers
$(RestoreAdditionalProjectSources) for the win?
d3dc21d
@jonathanpeppers
$(RestoreAdditionalProjectSources) in one more place
01f4dc2
@jonathanpeppers
DisableTransitiveFrameworkReferenceDownloads in tests
d34d4b0
jonathanpeppers
jonathanpeppers approved these changes Sep 26, 2023
View reviewed changes
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

Only test failure, we've seen happen randomly in the past:

IncrementalFastDeployment
Library2.dll should not have been uploaded
Expected: True
But was:  False

@jonathanpeppers jonathanpeppers merged commit 4c7b645 into release/8.0.1xx-rc2 Sep 26, 2023
@jonathanpeppers jonathanpeppers deleted the darc-release/8.0.1xx-rc2-9f1127c7-556a-4026-bbf6-0ccb630b6fcf branch September 26, 2023 00:32
jonathanpeppers added a commit to jonathanpeppers/xamarin-android that referenced this pull request Sep 26, 2023
@jonathanpeppers
[tests] set $(DisableTransitiveFrameworkReferenceDownloads)
3f8ba7f 
Context: dotnet#8360

MSBuild tests that use `net7.0-android` `TargetFrameworks` can fail
on release branches with:

    (Restore target) ->
    error NU1102: Unable to find package Microsoft.AspNetCore.App.Ref with version (= 7.0.12)
    error NU1102:   - Found 1621 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22513.3 ]
    error NU1102:   - Found 1537 version(s) in dotnet8 [ Nearest version: 8.0.0-alpha.1.22416.11 ]
    error NU1102:   - Found 87 version(s) in testsource1 [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 87 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-emsdk-9506882
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-26e0f82
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-301ba1e
    error NU1102:   - Found 0 version(s) in dotnet-eng
    error NU1102:   - Found 0 version(s) in dotnet8-transport
    error NU1102:   - Found 0 version(s) in xamarin.android util
        0 Warning(s)
        1 Error(s)

To solve this, we can set `$(DisableTransitiveFrameworkReferenceDownloads)`
as we did in 2320e20 so it doesn't try to restore ASP.NET or Windows
Desktop packs.

The MSBuild integration tests have their own `Directory.Build.props`, so
this seems like a reasonable place to set this value.
@jonathanpeppers jonathanpeppers mentioned this pull request Sep 26, 2023
Merged
jonathanpeppers added a commit that referenced this pull request Sep 26, 2023
@jonathanpeppers
[tests] set $(DisableTransitiveFrameworkReferenceDownloads) (#8374)
95946d2 
Context: #8360

MSBuild tests that use `net7.0-android` `TargetFrameworks` can fail
on release branches with:

    (Restore target) ->
    error NU1102: Unable to find package Microsoft.AspNetCore.App.Ref with version (= 7.0.12)
    error NU1102:   - Found 1621 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22513.3 ]
    error NU1102:   - Found 1537 version(s) in dotnet8 [ Nearest version: 8.0.0-alpha.1.22416.11 ]
    error NU1102:   - Found 87 version(s) in testsource1 [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 87 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-emsdk-9506882
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-26e0f82
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-301ba1e
    error NU1102:   - Found 0 version(s) in dotnet-eng
    error NU1102:   - Found 0 version(s) in dotnet8-transport
    error NU1102:   - Found 0 version(s) in xamarin.android util
        0 Warning(s)
        1 Error(s)

To solve this, we can set `$(DisableTransitiveFrameworkReferenceDownloads)`
as we did in 2320e20 so it doesn't try to restore ASP.NET or Windows
Desktop packs.

The MSBuild integration tests have their own `Directory.Build.props`, so
this seems like a reasonable place to set this value.
jonathanpeppers added a commit that referenced this pull request Sep 26, 2023
@jonathanpeppers
[tests] set $(DisableTransitiveFrameworkReferenceDownloads) (#8374)
39d58bd 
Context: #8360

MSBuild tests that use `net7.0-android` `TargetFrameworks` can fail
on release branches with:

    (Restore target) ->
    error NU1102: Unable to find package Microsoft.AspNetCore.App.Ref with version (= 7.0.12)
    error NU1102:   - Found 1621 version(s) in dotnet7 [ Nearest version: 7.0.0-rtm.22513.3 ]
    error NU1102:   - Found 1537 version(s) in dotnet8 [ Nearest version: 8.0.0-alpha.1.22416.11 ]
    error NU1102:   - Found 87 version(s) in testsource1 [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 87 version(s) in dotnet-public [ Nearest version: 8.0.0-preview.1.23112.2 ]
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-emsdk-9506882
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-26e0f82
    error NU1102:   - Found 0 version(s) in darc-pub-dotnet-runtime-301ba1e
    error NU1102:   - Found 0 version(s) in dotnet-eng
    error NU1102:   - Found 0 version(s) in dotnet8-transport
    error NU1102:   - Found 0 version(s) in xamarin.android util
        0 Warning(s)
        1 Error(s)

To solve this, we can set `$(DisableTransitiveFrameworkReferenceDownloads)`
as we did in 2320e20 so it doesn't try to restore ASP.NET or Windows
Desktop packs.

The MSBuild integration tests have their own `Directory.Build.props`, so
this seems like a reasonable place to set this value.
jonathanpeppers added a commit to dotnet/java-interop that referenced this pull request Sep 27, 2023
@jonathanpeppers
[build] introduce xamarin-android-tools.override.props
04e1b44 
Context: dotnet/android#8360

When .NET 8 RC 2 took a dependency on dotnet/runtime 7.0.12 and 6.0.23,
we added a `xamarin-android-tools.override.props` with the contents:

    <Project>
      <PropertyGroup>
        <RestoreAdditionalProjectSources>
          https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json;
          https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json;
        </RestoreAdditionalProjectSources>
      </PropertyGroup>
    </Project>

Unfortunately, this still broke for the submodule:

    external/java.interop/external/xamarin-android-tools

This led to the error during the `prepare java.interop Debug` stage:

    tests/api-compatibility/api-compatibility.targets(3,3): warning MSB4011: "Configuration.props" cannot be imported again. It was already imported at "build-tools/scripts/RunTests.targets (7,3)". This is most likely a build authoring error. This subsequent import will be ignored.
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 6.0.23)
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 86 version(s) in dotnet-public [ Nearest version: 7.0.0-preview.1.22076.8 ]
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 1 version(s) in dotnet-eng [ Nearest version: 5.0.0-alpha.1.19618.1 ]
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 6.0.23)
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 86 version(s) in dotnet-public [ Nearest version: 7.0.0-preview.1.22076.8 ]
    external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 1 version(s) in dotnet-eng [ Nearest version: 5.0.0-alpha.1.19618.1 ]
    build-tools/scripts/DotNet.targets(19,5): error MSB3073: The command ""bin/Release/dotnet/dotnet" build -t:Prepare Java.Interop.sln -c Debug -p:JdksRoot= -p:DotnetToolPath=bin/Release/dotnet/dotnet -bl:build-tools/scripts/../../bin/BuildDebug/msbuild-20230925T183954-prepare-java-interop.binlog" exited with code 1.
        1 Warning(s)
        7 Error(s)

Introduce a `xamarin-android-tools.override.props` to import
`..\Directory.Build.props` and avoid this in the future.
@jonathanpeppers jonathanpeppers mentioned this pull request Sep 27, 2023
Merged
jonpryor pushed a commit to dotnet/java-interop that referenced this pull request Sep 29, 2023
@jonathanpeppers
[build] introduce xamarin-android-tools.override.props (#1148)
d7f41c4 
Context: dotnet/android#8360
Context: 8898bc1
Context: 9a878f2
Context: dotnet/android-tools@34e98e2

When .NET 8 RC 2 took a dependency on dotnet/runtime 7.0.12 and 6.0.23,
we added `external/xamarin-android-tools.override.props` in
dotnet/android#8360 with the contents:

	<Project>
	  <PropertyGroup>
	    <RestoreAdditionalProjectSources>
	      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json;
	      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json;
	    </RestoreAdditionalProjectSources>
	  </PropertyGroup>
	</Project>

This allowed xamarin-android/external/xamarin-android-tools to find
and use the new NuGet sources, but
xamarin-android/external/Java.Interop uses its own checkout of
xamarin-android-tools in
`xamarin-android/external/java.interop/external/xamarin-android-tools`.`

This led to the error during the `prepare java.interop Debug` stage:

	tests/api-compatibility/api-compatibility.targets(3,3): warning MSB4011: "Configuration.props" cannot be imported again. It was already imported at "build-tools/scripts/RunTests.targets (7,3)". This is most likely a build authoring error. This subsequent import will be ignored.
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 6.0.23)
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 86 version(s) in dotnet-public [ Nearest version: 7.0.0-preview.1.22076.8 ]
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 1 version(s) in dotnet-eng [ Nearest version: 5.0.0-alpha.1.19618.1 ]
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 6.0.23)
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 86 version(s) in dotnet-public [ Nearest version: 7.0.0-preview.1.22076.8 ]
	external/Java.Interop/external/xamarin-android-tools/src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.AndroidSdk.csproj : error NU1102: - Found 1 version(s) in dotnet-eng [ Nearest version: 5.0.0-alpha.1.19618.1 ]
	build-tools/scripts/DotNet.targets(19,5): error MSB3073: The command ""bin/Release/dotnet/dotnet" build -t:Prepare Java.Interop.sln -c Debug -p:JdksRoot= -p:DotnetToolPath=bin/Release/dotnet/dotnet -bl:build-tools/scripts/../../bin/BuildDebug/msbuild-20230925T183954-prepare-java-interop.binlog" exited with code 1.
	    1 Warning(s)
	    7 Error(s)

Introduce an `external/xamarin-android-tools.override.props` within
Java.Interop which imports `..\Directory.Build.props`.  This allows
MSBuild properties to "flow" from a "parent"
`xamarin-android/external/Java.Interop.override.props` through to
`xamarin-android/external/Java.Interop/external/xamarin-android-tools`,
allowing a xamarin-android checkout to more easily control MSBuild
properties used by xamarin-android-tools.
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers approved these changes

@pjcollins pjcollins Awaiting requested review from pjcollins pjcollins is a code owner

@jonpryor jonpryor Awaiting requested review from jonpryor

@dellis1972 dellis1972 Awaiting requested review from dellis1972 dellis1972 is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jonathanpeppers