Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/core-setup build 2…
Browse files Browse the repository at this point in the history
…0191022.10

- Microsoft.NETCore.App - 5.0.0-alpha1.19522.10

Dependency coherency updates

- Microsoft.NETCore.Platforms - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- Microsoft.Win32.Registry - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- Microsoft.Win32.SystemEvents - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.CodeDom - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Configuration.ConfigurationManager - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Drawing.Common - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Resources.Extensions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Security.Cryptography.Cng - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Security.Permissions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- System.Windows.Extensions - 5.0.0-alpha1.19521.4 (parent: Microsoft.NETCore.App)
- Microsoft.NET.Sdk.IL - 5.0.0-alpha1.19522.3 (parent: Microsoft.NETCore.App)
- Microsoft.NETCore.ILAsm - 5.0.0-alpha1.19522.3 (parent: Microsoft.NETCore.App)

Fix tests to account for dotnet/corefx#40215
  • Loading branch information
dotnet-maestro[bot] authored and RussKie committed Oct 24, 2019
1 parent ce16a6c commit f3ac126
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 42 deletions.
4 changes: 4 additions & 0 deletions build-local.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ function Remove-Artifacts {
[string] $Path
)

if (!(Test-Path $Path)) {
return 0;
}

$errorCount = 0;
Get-ChildItem -Path $Path -Include @( 'bin', 'obj' ) -Recurse | ForEach-Object {
$fullPath = $_.FullName;
Expand Down
52 changes: 26 additions & 26 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,60 +10,60 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
</ProductDependencies>
<ToolsetDependencies>
<!-- Core Setup for coherency -->
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19514.1">
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-alpha1.19522.10">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>4ace84dbf94128b4825c76cdd09b46dba7473478</Sha>
<Sha>57b6a955d50a983d290a5add72c244e19a56cb2a</Sha>
</Dependency>
<!-- CoreFX via Core Setup -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.CodeDom" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Configuration.ConfigurationManager" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Drawing.Common" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Security.Permissions" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19504.7" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="System.Windows.Extensions" Version="5.0.0-alpha1.19521.4" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>a434a52ae3f1175bc1cad8b1a02b0921ef3b1f55</Sha>
<Sha>46299619e290936c495264162ede68354ced5b18</Sha>
</Dependency>
<!-- CoreCLR via Core Setup -->
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.0-alpha1.19513.3" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.0-alpha1.19522.3" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
<Sha>71fe5c4796cd01fa62e202aab2ebc180d0e4a799</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19513.3" CoherentParentDependency="Microsoft.NETCore.App">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.0-alpha1.19522.3" CoherentParentDependency="Microsoft.NETCore.App">
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
<Sha>71fe5c4796cd01fa62e202aab2ebc180d0e4a799</Sha>
<SourceBuildId>5596</SourceBuildId>
</Dependency>
<!-- Arcade -->
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
<!-- Below have corresponding entries in Versions.Details.XML because they are updated via Maestro -->
<!-- Core Setup for coherency -->
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>5.0.0-alpha1.19514.1</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>5.0.0-alpha1.19522.10</MicrosoftNETCoreAppPackageVersion>
</PropertyGroup>
<!-- CoreFX via Core Setup -->
<PropertyGroup>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19504.7</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19504.7</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha1.19504.7</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>5.0.0-alpha1.19504.7</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-alpha1.19504.7</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0-alpha1.19504.7</SystemDrawingCommonPackageVersion>
<SystemResourcesExtensionsPackageVersion>5.0.0-alpha1.19504.7</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19504.7</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-alpha1.19504.7</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-alpha1.19504.7</SystemWindowsExtensionsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-alpha1.19521.4</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-alpha1.19521.4</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-alpha1.19521.4</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>5.0.0-alpha1.19521.4</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>5.0.0-alpha1.19521.4</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0-alpha1.19521.4</SystemDrawingCommonPackageVersion>
<SystemResourcesExtensionsPackageVersion>5.0.0-alpha1.19521.4</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-alpha1.19521.4</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-alpha1.19521.4</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-alpha1.19521.4</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- CoreCLR via Core Setup -->
<PropertyGroup>
<MicrosoftNETCoreILPackageVersion>3.0.0-preview5-27616-73</MicrosoftNETCoreILPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>5.0.0-alpha1.19513.3</MicrosoftNETCoreILAsmPackageVersion>
<MicrosoftNETCoreILAsmPackageVersion>5.0.0-alpha1.19522.3</MicrosoftNETCoreILAsmPackageVersion>
</PropertyGroup>
<!-- Arcade -->
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19522.8",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19522.8",
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19513.3"
"Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19522.3"
},
"native-tools": {
"dotnet-api-docs_netcoreapp3.0": "0.0.0.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
using System.ComponentModel;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
using Xunit;
Expand Down Expand Up @@ -705,7 +703,7 @@ public void TableLayoutSettings_Serialize_InvalidStringConverter_DeserializeThro
formatter.Serialize(stream, settings);
stream.Seek(0, SeekOrigin.Begin);

Assert.Throws<TargetInvocationException>(() => formatter.Deserialize(stream));
Assert.Throws<SerializationException>(() => formatter.Deserialize(stream));
}
}

Expand Down

0 comments on commit f3ac126

Please sign in to comment.