diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4d15a42fc4a2..c405b00f6617 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,42 +6,42 @@
254931ff59bd27c0aac1c2cf6c9258fc6174b834
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
https://github.com/dotnet/emsdk
@@ -189,25 +189,25 @@
https://github.com/microsoft/vstest
919ec8358820228cc5fa77ef000051c1d6875399
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
https://github.com/dotnet/windowsdesktop
@@ -382,19 +382,19 @@
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
@@ -415,9 +415,9 @@
https://github.com/dotnet/arcade
e4bd767159fde419b50dd54c6d83e1ef970a68d0
-
+
https://github.com/dotnet/runtime
- 609b86351cd7c0aa7f8d0d7627be46ce19654a46
+ 24d7f5a58ac4bcee1ec5197427068e437f19552f
https://github.com/dotnet/xliff-tasks
diff --git a/eng/Versions.props b/eng/Versions.props
index 20d66214a0f4..edb97341228c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -32,12 +32,12 @@
7.0.0
8.0.0-beta.23353.2
7.0.0-preview.22423.2
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
4.3.0
4.3.0
4.0.5
7.0.2
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
4.6.0
2.0.0-beta4.23307.1
1.0.0-preview.6.23206.1
@@ -45,18 +45,18 @@
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
$(MicrosoftExtensionsDependencyModelPackageVersion)
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
$(MicrosoftExtensionsLoggingConsoleVersion)
$(MicrosoftExtensionsLoggingConsoleVersion)
@@ -85,9 +85,9 @@
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
- 8.0.0-preview.7.23356.10
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
+ 8.0.0-preview.7.23357.3
diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
index 989e6d7139fc..d8a425852540 100644
--- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
+++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
@@ -190,6 +190,7 @@ public interface IPoint
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public partial interface IPoint
{
// Property signatures:
@@ -344,10 +345,16 @@ public class Node5 : BaseNodeMultiple { }
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(2)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class BaseNodeMultiple { }
+ [System.Runtime.CompilerServices.NullableContext(2)]
+ [Nullable(new[] { 0, 1 })]
public partial class Node4 : BaseNodeMultiple { }
+ [System.Runtime.CompilerServices.NullableContext(2)]
+ [Nullable(new[] { 0, 1, 1 })]
public partial class Node5 : BaseNodeMultiple { }
}
""");
@@ -463,11 +470,15 @@ public event System.EventHandler OnNewMessage { add { } remove { } }
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public abstract partial class AbstractEvents
{
public abstract event System.EventHandler TextChanged;
}
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class Events
{
public event System.EventHandler OnNewMessage { add { } remove { } }
@@ -611,9 +622,13 @@ public class Car : System.IEquatable
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class Car : System.IEquatable
{
+ [System.Runtime.CompilerServices.NullableContext(2)]
public bool Equals(Car? c) { throw null; }
+ [System.Runtime.CompilerServices.NullableContext(2)]
public override bool Equals(object? o) { throw null; }
public override int GetHashCode() { throw null; }
public static bool operator ==(Car lhs, Car rhs) { throw null; }
@@ -694,6 +709,8 @@ public class Bar
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(2)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class Bar
{
public int? AMember { get { throw null; } set { } }
@@ -722,6 +739,7 @@ namespace Foo
{
public static partial class MyExtensions
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public static int WordCount(this string str) { throw null; }
}
}
@@ -745,6 +763,7 @@ namespace Foo
{
public partial class Bar
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public void Execute(params int[] list) { }
}
}
@@ -912,6 +931,7 @@ public partial interface IAsyncEnumerable
namespace Foo
{
public delegate void Action(T obj);
+ [System.Runtime.CompilerServices.NullableContext(2)]
public partial interface IAsyncEnumerable
{
}
@@ -939,6 +959,8 @@ public class Bar
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class Bar
{
#pragma warning disable CS8597
@@ -976,12 +998,14 @@ namespace Foo
{
public abstract partial class A
{
+ [System.Runtime.CompilerServices.NullableContext(2)]
public abstract TResult? Accept(int a);
}
public sealed partial class B : A
{
#pragma warning disable CS8597
+ [System.Runtime.CompilerServices.NullableContext(2)]
public override TResult? Accept(int a) where TResult : default { throw null; }
#pragma warning restore CS8597
}
@@ -1083,6 +1107,8 @@ public struct Bar where T : notnull
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial struct Bar
{
private System.Collections.Generic.Dictionary> _field;
@@ -1115,6 +1141,7 @@ public readonly partial struct Bar
private readonly System.Collections.Generic.List> _Baz_k__BackingField;
private readonly object _dummy;
private readonly int _dummyPrimitive;
+ [Nullable(new[] { 1, 0, 1 })]
public System.Collections.Generic.List> Baz { get { throw null; } }
}
}
@@ -1295,6 +1322,8 @@ public partial class D : B
internal D() : base(default) {}
}
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class E
{
internal E() {}
@@ -1353,6 +1382,8 @@ public partial class D : B
internal D(int i) : base(default) { }
}
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class E
{
internal E(P p) { }
@@ -1434,6 +1465,7 @@ public partial class A
public partial class B
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public B(int p1, string p2, A p3) { }
}
@@ -1475,6 +1507,8 @@ public partial class A
{
}
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class B
{
public B(int p1, string p2, A p3) { }
@@ -1516,6 +1550,7 @@ public partial class A
{
public A(char c) { }
public A(int i) { }
+ [System.Runtime.CompilerServices.NullableContext(1)]
public A(string s) { }
}
@@ -1554,6 +1589,8 @@ public class V { }
expected: """
namespace Foo
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class A
{
public A(Id id, System.Collections.Generic.IEnumerable deps) { }
@@ -1598,6 +1635,7 @@ namespace Foo
{
public partial class B
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public B(int p1, string p2) { }
[System.Obsolete("Constructor is deprecated.", true)]
public B(int p1) { }
@@ -1635,6 +1673,7 @@ namespace Foo
{
public partial class B
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public B(int p1, string p2) { }
[System.Obsolete("Constructor is deprecated.")]
public B(int p1) { }
@@ -1672,6 +1711,7 @@ namespace Foo
{
public partial class B
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public B(int p1, string p2) { }
[System.Obsolete(null)]
public B(int p1) { }
@@ -2137,6 +2177,7 @@ public class PerLanguageOption : AreEqual, IOption
expected: """
namespace A
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
public partial interface AreEqual
{
bool Compare(T other);
@@ -2243,7 +2284,9 @@ public partial class C : IFun, IExplicit, IExplicit2
public int Foo;
public int Baz { get { throw null; } }
public int ExplicitProperty { get { throw null; } }
+ [System.Runtime.CompilerServices.Nullable(1)]
public C this[int i] { get { throw null; } set {} }
+ [System.Runtime.CompilerServices.Nullable(1)]
public event System.EventHandler MyEvent { add {} remove {} }
void IExplicit.Explicit() {}
public void Do() {}
@@ -2251,6 +2294,7 @@ public void Do(float f) {}
public static void DoStatic() {}
public void Explicit2() {}
public void Fun() {}
+ [System.Runtime.CompilerServices.NullableContext(2)]
public void Gen() {}
public void Zoo() {}
public partial class MyNestedClass {}
@@ -2264,7 +2308,9 @@ public partial class D : C, IExplicit, IExplicit2
public new int Foo;
int IExplicit2.ExplicitProperty { get { throw null; } }
public new int Baz { get { throw null; } set {} }
+ [System.Runtime.CompilerServices.Nullable(1)]
public new D this[int i] { get { throw null; } set {} }
+ [System.Runtime.CompilerServices.Nullable(1)]
public new event System.EventHandler MyEvent { add {} remove {} }
void IExplicit2.Explicit2() {}
public new void Do() {}
@@ -2284,6 +2330,7 @@ public partial class E : C, IExplicit, IExplicit2
public new const int Do = 30;
int IExplicit2.ExplicitProperty { get { throw null; } }
public new int Foo { get { throw null; } set {} }
+ [System.Runtime.CompilerServices.Nullable(1)]
public new event System.EventHandler MyNestedClass { add {} remove {} }
void IExplicit.Explicit() {}
void IExplicit2.Explicit2() {}
@@ -2313,6 +2360,8 @@ public void TestAttributeWithInternalTypeArgumentOmitted(bool includeInternalSym
string expected = includeInternalSymbols ? """
namespace A
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class AnyTestAttribute : System.Attribute
{
public AnyTestAttribute(System.Type xType) { }
@@ -2333,6 +2382,8 @@ public partial class PublicClass
""" : """
namespace A
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class AnyTestAttribute : System.Attribute
{
public AnyTestAttribute(System.Type xType) { }
@@ -2401,6 +2452,8 @@ public class Foo : System.Collections.ICollection, System.Collections.Generic
expected: """
namespace A
{
+ [System.Runtime.CompilerServices.NullableContext(1)]
+ [System.Runtime.CompilerServices.Nullable(0)]
public partial class Foo : System.Collections.ICollection, System.Collections.IEnumerable, System.Collections.Generic.ICollection, System.Collections.Generic.IEnumerable
{
int System.Collections.Generic.ICollection.Count { get { throw null; } }
diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
index d583fab4f4a7..75f0d19bd5c7 100644
--- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
+++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs
@@ -157,7 +157,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
return publishDirectory;
}
- [DockerAvailableTheory]
+ [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/33858")]
[InlineData(false)]
[InlineData(true)]
public async Task EndToEnd_NoAPI_Web(bool addPackageReference)