Skip to content

Commit 6020e55

Browse files
tarekghtarekgh
authored
Merge branch 'release/8.0-staging' into merge/release/8.0-to-release/8.0-staging
2 parents afc6934 + d39c236 commit 6020e55

File tree

18 files changed

+256
-138
lines changed

18 files changed

+256
-138
lines changed

‎NuGet.config

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-2b0cca8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-2b0cca8-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-3/nuget/v3/index.json" />
14+
<add key="darc-pub-dotnet-emsdk-2b0cca8-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-2/nuget/v3/index.json" />
15+
<add key="darc-pub-dotnet-emsdk-2b0cca8-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a-1/nuget/v3/index.json" />
1216
<add key="darc-pub-dotnet-emsdk-976b101" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e/nuget/v3/index.json" />
17+
<add key="darc-pub-dotnet-emsdk-976b101-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e-4/nuget/v3/index.json" />
18+
<add key="darc-pub-dotnet-emsdk-976b101-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e-3/nuget/v3/index.json" />
19+
<add key="darc-pub-dotnet-emsdk-976b101-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e-2/nuget/v3/index.json" />
20+
<add key="darc-pub-dotnet-emsdk-976b101-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e-1/nuget/v3/index.json" />
1321
<!-- End: Package sources from dotnet-emsdk -->
1422
<!-- Begin: Package sources from dotnet-sdk -->
1523
<!-- End: Package sources from dotnet-sdk -->

‎eng/Version.Details.xml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@
9999
<Sha>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25210.2">
102+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25269.2">
103103
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
104-
<Sha>6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c</Sha>
104+
<Sha>cee2d057118e3ad3c58a72a23271ad88b87d4d4d</Sha>
105105
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
106106
</Dependency>
107107
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
@@ -185,57 +185,57 @@
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186186
<Sha>20ab70a74d52b68f4271bd946884e24049b14f83</Sha>
187187
</Dependency>
188-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25266.1">
188+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25311.1">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
190-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
190+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
191191
</Dependency>
192-
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25266.1">
192+
<Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.25311.1">
193193
<Uri>https://github.com/dotnet/runtime-assets</Uri>
194-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
194+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
195195
</Dependency>
196-
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25266.1">
196+
<Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.25311.1">
197197
<Uri>https://github.com/dotnet/runtime-assets</Uri>
198-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
198+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
199199
</Dependency>
200-
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25266.1">
200+
<Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.25311.1">
201201
<Uri>https://github.com/dotnet/runtime-assets</Uri>
202-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
202+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
203203
</Dependency>
204-
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25266.1">
204+
<Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.25311.1">
205205
<Uri>https://github.com/dotnet/runtime-assets</Uri>
206-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
206+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
207207
</Dependency>
208-
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25266.1">
208+
<Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.25311.1">
209209
<Uri>https://github.com/dotnet/runtime-assets</Uri>
210-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
210+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
211211
</Dependency>
212-
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25266.1">
212+
<Dependency Name="System.Net.TestData" Version="8.0.0-beta.25311.1">
213213
<Uri>https://github.com/dotnet/runtime-assets</Uri>
214-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
214+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
215215
</Dependency>
216-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25266.1">
216+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.25311.1">
217217
<Uri>https://github.com/dotnet/runtime-assets</Uri>
218-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
218+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
219219
</Dependency>
220-
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25266.1">
220+
<Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.25311.1">
221221
<Uri>https://github.com/dotnet/runtime-assets</Uri>
222-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
222+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
223223
</Dependency>
224-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25266.1">
224+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.25311.1">
225225
<Uri>https://github.com/dotnet/runtime-assets</Uri>
226-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
226+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
227227
</Dependency>
228-
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25266.1">
228+
<Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.25311.1">
229229
<Uri>https://github.com/dotnet/runtime-assets</Uri>
230-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
230+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
231231
</Dependency>
232-
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25266.1">
232+
<Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.25311.1">
233233
<Uri>https://github.com/dotnet/runtime-assets</Uri>
234-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
234+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
235235
</Dependency>
236-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25266.1">
236+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.25311.1">
237237
<Uri>https://github.com/dotnet/runtime-assets</Uri>
238-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
238+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
239239
</Dependency>
240240
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.24362.2" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
241241
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -354,13 +354,13 @@
354354
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
355355
<Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
356356
</Dependency>
357-
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25265.1">
357+
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.25330.2">
358358
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
359-
<Sha>6907eb448c5b24e402a45086171ab6c7e2269056</Sha>
359+
<Sha>733b3be8cce2b6eb42a151bf95fbb05500fa40ee</Sha>
360360
</Dependency>
361-
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25266.1">
361+
<Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.25311.1">
362362
<Uri>https://github.com/dotnet/runtime-assets</Uri>
363-
<Sha>f223eaeaa143e11a248ee81611819e3803883e6f</Sha>
363+
<Sha>1ef844c35b4db6c120722d0abcc64dba0d3d0685</Sha>
364364
</Dependency>
365365
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
366366
<Uri>https://github.com/dotnet/roslyn</Uri>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -153,20 +153,20 @@
153153
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
154154
<runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
155155
<!-- Runtime-Assets dependencies -->
156-
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25266.1</SystemRuntimeNumericsTestDataVersion>
157-
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25266.1</SystemComponentModelTypeConverterTestDataVersion>
158-
<SystemDataCommonTestDataVersion>8.0.0-beta.25266.1</SystemDataCommonTestDataVersion>
159-
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25266.1</SystemDrawingCommonTestDataVersion>
160-
<SystemFormatsTarTestDataVersion>8.0.0-beta.25266.1</SystemFormatsTarTestDataVersion>
161-
<SystemIOCompressionTestDataVersion>8.0.0-beta.25266.1</SystemIOCompressionTestDataVersion>
162-
<SystemIOPackagingTestDataVersion>8.0.0-beta.25266.1</SystemIOPackagingTestDataVersion>
163-
<SystemNetTestDataVersion>8.0.0-beta.25266.1</SystemNetTestDataVersion>
164-
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25266.1</SystemPrivateRuntimeUnicodeDataVersion>
165-
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25266.1</SystemRuntimeTimeZoneDataVersion>
166-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25266.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
167-
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25266.1</SystemTextRegularExpressionsTestDataVersion>
168-
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25266.1</SystemWindowsExtensionsTestDataVersion>
169-
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25266.1</MicrosoftDotNetCilStripSourcesVersion>
156+
<SystemRuntimeNumericsTestDataVersion>8.0.0-beta.25311.1</SystemRuntimeNumericsTestDataVersion>
157+
<SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.25311.1</SystemComponentModelTypeConverterTestDataVersion>
158+
<SystemDataCommonTestDataVersion>8.0.0-beta.25311.1</SystemDataCommonTestDataVersion>
159+
<SystemDrawingCommonTestDataVersion>8.0.0-beta.25311.1</SystemDrawingCommonTestDataVersion>
160+
<SystemFormatsTarTestDataVersion>8.0.0-beta.25311.1</SystemFormatsTarTestDataVersion>
161+
<SystemIOCompressionTestDataVersion>8.0.0-beta.25311.1</SystemIOCompressionTestDataVersion>
162+
<SystemIOPackagingTestDataVersion>8.0.0-beta.25311.1</SystemIOPackagingTestDataVersion>
163+
<SystemNetTestDataVersion>8.0.0-beta.25311.1</SystemNetTestDataVersion>
164+
<SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.25311.1</SystemPrivateRuntimeUnicodeDataVersion>
165+
<SystemRuntimeTimeZoneDataVersion>8.0.0-beta.25311.1</SystemRuntimeTimeZoneDataVersion>
166+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.25311.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
167+
<SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.25311.1</SystemTextRegularExpressionsTestDataVersion>
168+
<SystemWindowsExtensionsTestDataVersion>8.0.0-beta.25311.1</SystemWindowsExtensionsTestDataVersion>
169+
<MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.25311.1</MicrosoftDotNetCilStripSourcesVersion>
170170
<!-- dotnet-optimization dependencies -->
171171
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
172172
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -198,7 +198,7 @@
198198
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.25255.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
199199
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.25255.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
200200
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.25255.2</MicrosoftDotNetXHarnessCLIVersion>
201-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25265.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
201+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.25330.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
202202
<XUnitVersion>2.4.2</XUnitVersion>
203203
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
204204
<XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>

‎src/coreclr/vm/olevariant.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4756,11 +4756,8 @@ void OleVariant::ConvertValueClassToVariant(OBJECTREF *pBoxedValueClass, VARIANT
47564756
// Marshal the contents of the value class into the record.
47574757
MethodDesc* pStructMarshalStub;
47584758
{
4759-
GCPROTECT_BEGIN(*pBoxedValueClass);
47604759
GCX_PREEMP();
4761-
47624760
pStructMarshalStub = NDirect::CreateStructMarshalILStub(pValueClassMT);
4763-
GCPROTECT_END();
47644761
}
47654762

47664763
MarshalStructViaILStub(pStructMarshalStub, (*pBoxedValueClass)->GetData(), (BYTE*)V_RECORD(pRecHolder), StructMarshalStubs::MarshalOperation::Marshal);

‎src/installer/tests/HostActivation.Tests/PortableAppActivation.cs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,33 @@ public void AppHost_FrameworkDependent_GlobalLocation_Succeeds(bool useRegistere
216216
}
217217
}
218218

219+
[Fact]
220+
[PlatformSpecific(TestPlatforms.Windows)]
221+
public void AppHost_DotNetRoot_DevicePath()
222+
{
223+
string appExe = sharedTestState.PortableAppFixture_Published.TestProject.AppExe;
224+
225+
string dotnetPath = $@"\\?\{sharedTestState.PortableAppFixture_Published.BuiltDotnet.BinPath}";
226+
Command.Create(appExe)
227+
.CaptureStdErr()
228+
.CaptureStdOut()
229+
.DotNetRoot(dotnetPath, sharedTestState.RepoDirectories.BuildArchitecture)
230+
.Execute()
231+
.Should().Pass()
232+
.And.HaveStdOutContaining("Hello World")
233+
.And.HaveStdOutContaining(sharedTestState.RepoDirectories.MicrosoftNETCoreAppVersion);
234+
235+
dotnetPath = $@"\\.\{sharedTestState.PortableAppFixture_Published.BuiltDotnet.BinPath}";
236+
Command.Create(appExe)
237+
.CaptureStdErr()
238+
.CaptureStdOut()
239+
.DotNetRoot(dotnetPath, sharedTestState.RepoDirectories.BuildArchitecture)
240+
.Execute()
241+
.Should().Pass()
242+
.And.HaveStdOutContaining("Hello World")
243+
.And.HaveStdOutContaining(sharedTestState.RepoDirectories.MicrosoftNETCoreAppVersion);
244+
}
245+
219246
[Fact]
220247
public void RuntimeConfig_FilePath_Breaks_MAX_PATH_Threshold()
221248
{

‎src/installer/tests/HostActivation.Tests/StandaloneAppActivation.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,29 @@ public void Running_Publish_Output_Standalone_EXE_with_Bound_AppHost_Succeeds()
254254
}
255255
}
256256

257+
[Fact]
258+
[PlatformSpecific(TestPlatforms.Windows)]
259+
public void DevicePath()
260+
{
261+
string appExe = $@"\\?\{sharedTestState.StandaloneAppFixture_Published.TestProject.AppExe}";
262+
Command.Create(appExe)
263+
.CaptureStdErr()
264+
.CaptureStdOut()
265+
.Execute()
266+
.Should().Pass()
267+
.And.HaveStdOutContaining("Hello World")
268+
.And.HaveStdOutContaining(sharedTestState.RepoDirectories.MicrosoftNETCoreAppVersion);
269+
270+
appExe = $@"\\.\{sharedTestState.StandaloneAppFixture_Published.TestProject.AppExe}";
271+
Command.Create(appExe)
272+
.CaptureStdErr()
273+
.CaptureStdOut()
274+
.Execute()
275+
.Should().Pass()
276+
.And.HaveStdOutContaining("Hello World")
277+
.And.HaveStdOutContaining(sharedTestState.RepoDirectories.MicrosoftNETCoreAppVersion);
278+
}
279+
257280
[Fact]
258281
[PlatformSpecific(TestPlatforms.Windows)] // GUI app host is only supported on Windows.
259282
public void Running_AppHost_with_GUI_No_Console()

‎src/libraries/Common/src/Interop/OSX/Interop.libobjc.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,17 @@ internal static Version GetOperatingSystemVersion()
4646
}
4747
}
4848

49-
if (major == 10 && minor == 16)
49+
#if TARGET_OSX
50+
if (major == 16)
5051
{
51-
// We get "compat" version for 11.0 unless we build with updated SDK.
52-
// Hopefully that will be before 11.x comes out
53-
// For now, this maps 10.16 to 11.0.
54-
major = 11;
55-
minor = 0;
52+
// MacOS Tahoe returns a compatibility version unless it is built with a new SDK. Map the compatibility
53+
// version to the "correct" version. This assumes the minor versions will map unchanged.
54+
// 16.0 => 26.0
55+
// 16.1 => 26.1
56+
// etc
57+
major = 26;
5658
}
59+
#endif
5760

5861
return new Version(major, minor, patch);
5962
}

0 commit comments

Comments
 (0)