Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dotnet/runtime
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5223f01
Choose a base ref
...
head repository: dotnet/runtime
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de84cf9
Choose a head ref
  • 5 commits
  • 34 files changed
  • 6 contributors

Commits on Nov 23, 2022

  1. Don't bind against non-shipping contract assemblies (#78730) 

    Manual backport of c8503d3
Fixes #77988
Unblocks #78532

Introduce the AnnotateTargetPathWithContract switch to
make it configure-able when a source project should
return the reference project's assembly instead of
the source assembly, when other projects compile
against it. Set it so that reference assemblies are
only returned for NetCoreAppCurrent tfms or when the
project isn't packable.

- Fix System.DirectoryServices.AccountManagement build
System.DirectoryServices.AccountManagement now builds against
src/System.DirectoryServices instead of ref/System.DirectoryServices
(because the package doesn't contain the ref assembly).

Because of that, the compiler now gets confused because of the
System.DirectoryServices.Interop namespace and the global Interop class.
This happens even though the DirectoryServices.Interop namespace doesn't include any
public types.

That results in the following errors:

src\libraries\System.DirectoryServices.AccountManagement\src\System\DirectoryServices\AccountManagement\AD\SidList.cs(50,26): error CS0246: The type or namespace name 'SID_AND_ATTRIBUTES' could not be found (are you missing a using directive or an assembly reference?)
src\libraries\System.DirectoryServices.AccountManagement\src\System\DirectoryServices\AccountManagement\interopt.cs(439,20): error CS0246: The type or namespace name 'UNICODE_INTPTR_STRING' could not be found (are you missing a using directive or an assembly reference?)
This commit fixes that by removing the System.DirectoryServices.Interop
namespace and moving the types into the parent namespace.

- Suppress nullable warnings in Serialization.Schema
Now that Schema compiles against the source assembly of System.CodeDom,
it receives nullability errors. I'm suppressing them manually for now
but am filing an issue to correctly fix those.

Related: #78036
    @ViktorHofer
    ViktorHofer authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    b486b74 View commit details
    Browse the repository at this point in the history

  2. Update dependencies from https://github.com/dotnet/icu build 20221114… 

    ….1 (#78503)

Microsoft.NETCore.Runtime.ICU.Transport
 From Version 7.0.0-rtm.22559.1 -> To Version 7.0.0-rtm.22564.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    @dotnet-maestro
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    c5b2dd8 View commit details
    Browse the repository at this point in the history

  3. Update dependencies from https://github.com/dotnet/llvm-project build… 

    … 20221122.1 (#78767)

runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx.11.0-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter , runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter
 From Version 1.0.0-alpha.1.22556.1 -> To Version 1.0.0-alpha.1.22572.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
    @dotnet-maestro
    dotnet-maestro[bot] and dotnet-maestro[bot] authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    e92b494 View commit details
    Browse the repository at this point in the history

  4. [release/7.0] Fix netfx build for S.S.C.Xml nuget package (#78734) 

    * Fix netfx build for S.S.C.Xml nuget package

* Also fix System.Threading.AccessControl

* Add nuget servicing properties

Co-authored-by: Jeremy Barton <jbarton@microsoft.com>
    @github-actions @bartonjs
    github-actions[bot] and bartonjs authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    12cf8b0 View commit details
    Browse the repository at this point in the history

  5. Explicitly omit RID from crossgen2 binary path (#78735) 

    Fixes dotnet/sdk#29177

Co-authored-by: Jan Kotas <jkotas@microsoft.com>
    @github-actions @jkotas
    github-actions[bot] and jkotas authored Nov 23, 2022
    Configuration menu
    Copy the full SHA
    de84cf9 View commit details
    Browse the repository at this point in the history
Loading