Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>8928ad83e2e5c33ce116c3b63eb94f611d72c2e2</CoreFxCurrentRef>
<CoreClrCurrentRef>b48a83561e6763d50668717a46130aaa94a4687e</CoreClrCurrentRef>
<CoreFxCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</CoreFxCurrentRef>
<CoreClrCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</CoreClrCurrentRef>
<ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef>
<ProjectNTfsCurrentRef>63be48cacc0f8c89abc9157f7a9afc68f21f9c58</ProjectNTfsCurrentRef>
<ProjectNTfsCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</ProjectNTfsCurrentRef>
<SniCurrentRef>05650e53f2aa4497f74cd6e9b053d3f69f64b0bd</SniCurrentRef>
<StandardCurrentRef>08ff016839d62c9455d16245524f46b16d7a1074</StandardCurrentRef>
<StandardCurrentRef>15741fef87cb527b10f09e6f13278f8717652f69</StandardCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>beta-25114-01</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>beta-25115-02</CoreClrExpectedPrerelease>
<CoreFxExpectedPrerelease>beta-25118-01</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>beta-25117-08</CoreClrExpectedPrerelease>
<ExternalExpectedPrerelease>beta-25016-01</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25116-00</ProjectNTfsExpectedPrerelease>
<NETStandardPackageVersion>2.0.0-beta-25115-01</NETStandardPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-25117-00</ProjectNTfsExpectedPrerelease>
<NETStandardPackageVersion>2.0.0-beta-25117-02</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<!-- Use the SNI runtime package -->
<SniPackageVersion>4.4.0-beta-25007-02</SniPackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions external/ilasm/project.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"frameworks": {
"{TFM}": {
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25115-02",
"Microsoft.NETCore.ILAsm": "2.0.0-beta-25115-02"
"Microsoft.NETCore.Platforms": "2.0.0-beta-25118-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25117-08",
"Microsoft.NETCore.ILAsm": "2.0.0-beta-25117-08"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion external/netstandard/netstandard1.x/project.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"{TFM}": {
"dependencies": {
"NETStandard.Library": "2.0.0-beta-25115-01",
"NETStandard.Library": "2.0.0-beta-25117-02",
"System.Diagnostics.Contracts": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Dynamic.Runtime": "4.3.0",
Expand Down
2 changes: 1 addition & 1 deletion external/netstandard/project.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"{TFM}": {
"dependencies": {
"NETStandard.Library": "2.0.0-beta-25115-01"
"NETStandard.Library": "2.0.0-beta-25117-02"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion external/runtime/NETNative/project.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"{TFM}": {
"dependencies": {
"Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-25116-00"
"Microsoft.TargetingPack.Private.NETNative": "1.1.0-beta-25117-00"
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions external/runtime/project.json.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"frameworks": {
"{TFM}": {
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0-beta-25114-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25115-02",
"Microsoft.NETCore.TestHost": "2.0.0-beta-25115-02",
"runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-24913-02",
"Microsoft.NETCore.Platforms": "2.0.0-beta-25118-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25117-08",
"Microsoft.NETCore.TestHost": "2.0.0-beta-25117-08",
"runtime.native.System.Data.SqlClient.sni": "4.4.0-beta-25118-01",
"Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00",
"Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00"
}
Expand Down
2 changes: 1 addition & 1 deletion src/Common/src/System/Diagnostics/Debug.Unix.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal sealed class UnixDebugLogger : IDebugLogger
{
private const string EnvVar_DebugWriteToStdErr = "COMPlus_DebugWriteToStdErr";
private static readonly bool s_shouldWriteToStdErr =
Environment.GetEnvironmentVariable(EnvVar_DebugWriteToStdErr) == "1";
Internal.Runtime.Augments.EnvironmentAugments.GetEnvironmentVariable(EnvVar_DebugWriteToStdErr) == "1";

public void ShowAssertDialog(string stackTrace, string message, string detailMessage)
{
Expand Down
3 changes: 1 addition & 2 deletions src/System.Threading/src/System.Threading.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" />
<!-- The Environment class is public in CoreCLR version of System.Private.CoreLib, however, internal in .NET Native's version -->
<ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" Condition="'$(TargetGroup)' == 'uapaot'" />
<ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
</ItemGroup>
<ItemGroup>
<ReferenceFromRuntime Include="System.Private.CoreLib" />
Expand Down