Skip to content

Commit

Permalink
[release/5.0] Update dependencies from dotnet/runtime (dotnet#4276)
Browse files Browse the repository at this point in the history
  • Loading branch information
dotnet-maestro[bot] authored Nov 26, 2020
1 parent 660239b commit 200d740
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 32 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-2767f44" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-2767f446/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-b02e13a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b02e13ab/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
34 changes: 17 additions & 17 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.1-servicing.20574.5">
<Dependency Name="Microsoft.NETCore.App" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -51,21 +51,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.1-servicing.20574.5">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20574.5">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20574.5">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20574.5">
<Dependency Name="runtime.win-x86.Microsoft.NETCore.ILAsm" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -95,13 +95,13 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.1-servicing.20574.5">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20574.5">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20575.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Targets" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand All @@ -119,9 +119,9 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="5.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -149,7 +149,7 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2767f4466bd3fe4e3678510aba636b66f02b11b4</Sha>
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
14 changes: 7 additions & 7 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>5.0.1-servicing.20574.5</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>5.0.0</SystemDirectoryServicesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>5.0.0</SystemReflectionMetadataLoadContextPackageVersion>
Expand All @@ -18,13 +18,13 @@
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
<SystemIOPackagingPackageVersion>5.0.0</SystemIOPackagingPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>5.0.0-preview.7.20320.5</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>5.0.1-servicing.20574.5</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20574.5</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreILDAsmPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreILDAsmPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreTargetsPackageVersion>5.0.0</MicrosoftNETCoreTargetsPackageVersion>
<SystemDiagnosticsPerformanceCounterPackageVersion>5.0.0</SystemDiagnosticsPerformanceCounterPackageVersion>
<SystemIOFileSystemAccessControlPackageVersion>5.0.0</SystemIOFileSystemAccessControlPackageVersion>
<SystemIOPipesAccessControlPackageVersion>5.0.0</SystemIOPipesAccessControlPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>5.0.1</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0</SystemTextJsonPackageVersion>
Expand All @@ -43,9 +43,9 @@
<SystemSecurityPermissionsPackageVersion>5.0.0</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCoreILPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20574.5</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20574.5</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20574.5</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx64MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20575.16</runtimewinx64MicrosoftNETCoreILAsmPackageVersion>
<runtimewinx86MicrosoftNETCoreILAsmPackageVersion>5.0.1-servicing.20575.16</runtimewinx86MicrosoftNETCoreILAsmPackageVersion>
<!--
Microsoft.NET.Sdk.IL.targets requires definition of MicrosoftNETCoreILAsmVersion
-->
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Microsoft.DotNet.CMake.Sdk": "5.0.0-beta.20256.5",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20560.3",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.1-servicing.20574.5"
"Microsoft.NET.Sdk.IL": "5.0.1-servicing.20575.16"
},
"native-tools": {
"cmake": "3.17.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.ComponentModel.Design.Serialization;
using System.Reflection;
using System.Windows.Forms.Design;
using Moq;
using WinForms.Common.Tests;
using Xunit;
Expand Down Expand Up @@ -981,15 +982,17 @@ public void DesignSurface_CreateDesigner_InvokeNoDesigner_ReturnsExpected(bool r
{
using var surface = new SubDesignSurface();
using var component = new Component();
Assert.Equal(rootDesigner, surface.CreateDesigner(component, rootDesigner) is null);

Assert.NotNull(surface.CreateDesigner(component, rootDesigner));
}

[WinFormsFact]
public void DesignSurface_CreateDesigner_InvokeIDesigner_ReturnsExpected()
{
using var surface = new SubDesignSurface();
using var component = new DesignerComponent();
Assert.Null(surface.CreateDesigner(component, rootDesigner: true));

Assert.IsType<ComponentDocumentDesigner>(surface.CreateDesigner(component, rootDesigner: true));
Assert.IsType<ComponentDesigner>(surface.CreateDesigner(component, rootDesigner: false));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1666,8 +1666,8 @@ public void DesignerHost_Add_NoRootDesigner_ThrowsException(IComponent component
{
var surface = new SubDesignSurface();
IDesignerLoaderHost2 host = surface.Host;
Assert.Throws<Exception>(() => host.Container.Add(component));
Assert.Throws<Exception>(() => host.Container.Add(component, "name"));
Assert.Throws<NotImplementedException>(() => host.Container.Add(component));
Assert.Throws<NotImplementedException>(() => host.Container.Add(component, "name"));
Assert.Empty(host.Container.Components);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,9 @@ public void SiteNestedContainer_Add_NoRootDesigner_ThrowsException(IComponent co
using var surface = new DesignSurface();
using var owningComponent = new Component();
using INestedContainer container = surface.CreateNestedContainer(owningComponent, "containerName");
Assert.Throws<Exception>(() => container.Add(component));
Assert.Throws<Exception>(() => container.Add(component, "name"));

Assert.Throws<NotImplementedException>(() => container.Add(component));
Assert.Throws<NotImplementedException>(() => container.Add(component, "name"));
Assert.Empty(container.Components);
}

Expand Down

0 comments on commit 200d740

Please sign in to comment.