Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 1fcfccf

Browse files
dotnet-maestro-botAnipik
dotnet-maestro-bot
authored and
Anipik
committed
[automated] Merge branch 'release/3.0' => 'release/3.1' (#40293)
* [release/3.0]Handle `UnparseableExtension` status code when building X509Chain on … (#40117) Ignore `UnparseableExtension` status code when building X509Chain on OSX * [release/3.0] Update dependencies from 3 repositories (#40308) * Update dependencies from https://github.com/dotnet/core-setup build 20190814.02 - Microsoft.NETCore.App - 3.0.0-preview9-19414-02 - Microsoft.NETCore.DotNetHostPolicy - 3.0.0-preview9-19414-02 - Microsoft.NETCore.DotNetHost - 3.0.0-preview9-19414-02 * Update dependencies from https://github.com/dotnet/arcade build 20190812.7 - Microsoft.DotNet.XUnitExtensions - 2.4.1-beta.19412.7 - Microsoft.DotNet.XUnitConsoleRunner - 2.5.1-beta.19412.7 - Microsoft.DotNet.VersionTools.Tasks - 1.0.0-beta.19412.7 - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19412.7 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19412.7 - Microsoft.DotNet.Build.Tasks.Configuration - 1.0.0-beta.19412.7 - Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19412.7 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19412.7 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19412.7 - Microsoft.DotNet.CoreFxTesting - 1.0.0-beta.19412.7 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19412.7 - Microsoft.DotNet.GenFacades - 1.0.0-beta.19412.7 - Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19412.7 - Microsoft.DotNet.RemoteExecutor - 1.0.0-beta.19412.7 * Update dependencies from https://github.com/dotnet/standard build 20190814.3 - NETStandard.Library - 2.1.0-prerelease.19414.3 * fixing ZipPackagePart.GetStreamCore crashes with NotSupportedException (#40355) ZipArchiveEntry only ever supports opening once when the backing archive is in Create mode, and the backing stream is non-seekable, so we shouldn't call SetLength in that case. You could still open an archive in Update mode then call part.GetStream(FileMode.Create), in which case we'll want this call to SetLength, so we only avoid this call when the backing Archive is in Create mode. updating test to explicitly test the Update path for ZipPackage skip UAP since we don't have access to the file system to create the .zip undo accidental change to existing test removing unnecessary variable * Support custom converters that treat non-null input as null (#40287) (#40357)
1 parent 037c7e5 commit 1fcfccf

File tree

13 files changed

+346
-107
lines changed

13 files changed

+346
-107
lines changed

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>
17-
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19412-05">
17+
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19414-02">
1818
<Uri>https://github.com/dotnet/core-setup</Uri>
19-
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
19+
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview9-19412-05">
21+
<Dependency Name="Microsoft.NETCore.DotNetHost" Version="3.0.0-preview9-19414-02">
2222
<Uri>https://github.com/dotnet/core-setup</Uri>
23-
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
23+
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview9-19412-05">
25+
<Dependency Name="Microsoft.NETCore.DotNetHostPolicy" Version="3.0.0-preview9-19414-02">
2626
<Uri>https://github.com/dotnet/core-setup</Uri>
27-
<Sha>16d0c88cff0642a49013048ea24980d65eeed626</Sha>
27+
<Sha>f1de07d0abab3899bd7e1facb7e375d6100a2ac8</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview9.19409.15">
3030
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -34,65 +34,65 @@
3434
<Uri>https://github.com/dotnet/corefx</Uri>
3535
<Sha>976b84b4d969ce5d87bc437d811ec8864b47947a</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.1">
37+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19412.7">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
39+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
4040
</Dependency>
41-
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19413.3">
41+
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19414.3">
4242
<Uri>https://github.com/dotnet/standard</Uri>
43-
<Sha>f27dd1491378aa0da5b15aac881fc4de2ea357a8</Sha>
43+
<Sha>7d56086e753abe6d9a99f67a9b6c021bf7c809ce</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.1">
45+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19412.7">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
47+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19412.1">
49+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19412.7">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
51+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.1">
53+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19412.7">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
55+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19412.1">
57+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19412.7">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
59+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19412.1">
61+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19412.7">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
63+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19412.1">
65+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19412.7">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
67+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19412.1">
69+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19412.7">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
71+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19412.1">
73+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19412.7">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
75+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19412.1">
77+
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19412.7">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
79+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19412.1">
81+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19412.7">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
83+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19412.1">
85+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19412.7">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
87+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19412.1">
89+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19412.7">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
91+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19412.1">
93+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19412.7">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>ec2dd5b3e7d11b88b2ca0688bb1685836cfad20a</Sha>
95+
<Sha>82c822ee7db08f5347e6ac44e3ed465248394a9e</Sha>
9696
</Dependency>
9797
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190807.1">
9898
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@
2929
</PropertyGroup>
3030
<PropertyGroup>
3131
<!-- Arcade dependencies -->
32-
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetApiCompatPackageVersion>
33-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetCodeAnalysisPackageVersion>
34-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetGenAPIPackageVersion>
35-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetGenFacadesPackageVersion>
36-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19412.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
37-
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19412.1</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
38-
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
39-
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetRemoteExecutorPackageVersion>
40-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19412.1</MicrosoftDotNetBuildTasksFeedVersion>
41-
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19412.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
32+
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetApiCompatPackageVersion>
33+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetCodeAnalysisPackageVersion>
34+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenAPIPackageVersion>
35+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetGenFacadesPackageVersion>
36+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19412.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
37+
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19412.7</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
38+
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetBuildTasksPackagingPackageVersion>
39+
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetRemoteExecutorPackageVersion>
40+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19412.7</MicrosoftDotNetBuildTasksFeedVersion>
41+
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19412.7</MicrosoftDotNetVersionToolsTasksPackageVersion>
4242
<!-- roslyn -->
4343
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
4444
<!-- Core-setup dependencies -->
45-
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreAppPackageVersion>
46-
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreDotNetHostPackageVersion>
47-
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview9-19412-05</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
45+
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreAppPackageVersion>
46+
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPackageVersion>
47+
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>3.0.0-preview9-19414-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
4848
<!-- Coreclr dependencies -->
4949
<MicrosoftNETCoreILAsmPackageVersion>3.0.0-preview9.19409.2</MicrosoftNETCoreILAsmPackageVersion>
5050
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview9.19409.2</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
5151
<!-- Corefx dependencies -->
5252
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview9.19409.15</MicrosoftNETCorePlatformsPackageVersion>
5353
<runtimenativeSystemIOPortsPackageVersion>4.6.0-preview9.19409.15</runtimenativeSystemIOPortsPackageVersion>
5454
<!-- Standard dependencies -->
55-
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19413.3</NETStandardLibraryPackageVersion>
55+
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19414.3</NETStandardLibraryPackageVersion>
5656
<!-- dotnet-optimization dependencies -->
5757
<optimizationwindows_ntx64IBCCoreFxPackageVersion>99.99.99-master-20190807.1</optimizationwindows_ntx64IBCCoreFxPackageVersion>
5858
<!-- sni -->

‎eng/common/performance/performance-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if ($Framework.StartsWith("netcoreapp")) {
3333
}
3434

3535
if ($Internal) {
36-
$Queue = "Windows.10.Amd64.ClientRS5.Perf"
36+
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
3737
$PerfLabArguments = "--upload-to-perflab-container"
3838
$ExtraBenchmarkDotNetArguments = ""
3939
$Creator = ""

‎eng/common/performance/performance-setup.sh

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if [[ "$internal" == true ]]; then
132132
if [[ "$architecture" = "arm64" ]]; then
133133
queue=Ubuntu.1804.Arm64.Perf
134134
else
135-
queue=Ubuntu.1804.Amd64.Perf
135+
queue=Ubuntu.1804.Amd64.Tiger.Perf
136136
fi
137137
fi
138138

@@ -157,20 +157,20 @@ if [[ "$use_core_run" = true ]]; then
157157
fi
158158

159159
# Make sure all of our variables are available for future steps
160-
echo "##vso[task.setvariable variable=UseCoreRun]$use_core_run"
161-
echo "##vso[task.setvariable variable=Architecture]$architecture"
162-
echo "##vso[task.setvariable variable=PayloadDirectory]$payload_directory"
163-
echo "##vso[task.setvariable variable=PerformanceDirectory]$performance_directory"
164-
echo "##vso[task.setvariable variable=WorkItemDirectory]$workitem_directory"
165-
echo "##vso[task.setvariable variable=Queue]$queue"
166-
echo "##vso[task.setvariable variable=SetupArguments]$setup_arguments"
167-
echo "##vso[task.setvariable variable=Python]python3"
168-
echo "##vso[task.setvariable variable=PerfLabArguments]$perflab_arguments"
169-
echo "##vso[task.setvariable variable=ExtraBenchmarkDotNetArguments]$extra_benchmark_dotnet_arguments"
170-
echo "##vso[task.setvariable variable=BDNCategories]$run_categories"
171-
echo "##vso[task.setvariable variable=TargetCsproj]$csproj"
172-
echo "##vso[task.setvariable variable=RunFromPerfRepo]$run_from_perf_repo"
173-
echo "##vso[task.setvariable variable=Creator]$creator"
174-
echo "##vso[task.setvariable variable=HelixSourcePrefix]$helix_source_prefix"
175-
echo "##vso[task.setvariable variable=Kind]$kind"
176-
echo "##vso[task.setvariable variable=_BuildConfig]$architecture.$kind.$framework"
160+
Write-PipelineSetVariable -name "UseCoreRun" -value "$use_core_run" -is_multi_job_variable false
161+
Write-PipelineSetVariable -name "Architecture" -value "$architecture" -is_multi_job_variable false
162+
Write-PipelineSetVariable -name "PayloadDirectory" -value "$payload_directory" -is_multi_job_variable false
163+
Write-PipelineSetVariable -name "PerformanceDirectory" -value "$performance_directory" -is_multi_job_variable false
164+
Write-PipelineSetVariable -name "WorkItemDirectory" -value "$workitem_directory" -is_multi_job_variable false
165+
Write-PipelineSetVariable -name "Queue" -value "$queue" -is_multi_job_variable false
166+
Write-PipelineSetVariable -name "SetupArguments" -value "$setup_arguments" -is_multi_job_variable false
167+
Write-PipelineSetVariable -name "Python" -value "$python3" -is_multi_job_variable false
168+
Write-PipelineSetVariable -name "PerfLabArguments" -value "$perflab_arguments" -is_multi_job_variable false
169+
Write-PipelineSetVariable -name "ExtraBenchmarkDotNetArguments" -value "$extra_benchmark_dotnet_arguments" -is_multi_job_variable false
170+
Write-PipelineSetVariable -name "BDNCategories" -value "$run_categories" -is_multi_job_variable false
171+
Write-PipelineSetVariable -name "TargetCsproj" -value "$csproj" -is_multi_job_variable false
172+
Write-PipelineSetVariable -name "RunFromPerfRepo" -value "$run_from_perf_repo" -is_multi_job_variable false
173+
Write-PipelineSetVariable -name "Creator" -value "$creator" -is_multi_job_variable false
174+
Write-PipelineSetVariable -name "HelixSourcePrefix" -value "$helix_source_prefix" -is_multi_job_variable false
175+
Write-PipelineSetVariable -name "Kind" -value "$kind" -is_multi_job_variable false
176+
Write-PipelineSetVariable -name "_BuildConfig" -value "$architecture.$kind.$framework" -is_multi_job_variable false

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"dotnet": "3.0.100-preview7-012630"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.1",
11-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.1",
12-
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19412.1",
13-
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19412.1",
10+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19412.7",
11+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19412.7",
12+
"Microsoft.DotNet.Build.Tasks.Configuration": "1.0.0-beta.19412.7",
13+
"Microsoft.DotNet.CoreFxTesting": "1.0.0-beta.19412.7",
1414
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
1515
"Microsoft.NET.Sdk.IL": "3.0.0-preview9.19409.2"
1616
}

‎src/Native/Unix/System.Security.Cryptography.Native.Apple/pal_x509chain.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,10 @@ static void MergeStatusCodes(CFTypeRef key, CFTypeRef value, void* context)
174174
*pStatus |= PAL_X509ChainRevocationStatusUnknown;
175175
else if (CFEqual(keyString, CFSTR("MissingIntermediate")))
176176
*pStatus |= PAL_X509ChainPartialChain;
177+
else if (CFEqual(keyString, CFSTR("UnparseableExtension")))
178+
{
179+
// 10.15 introduced new status code value which is not reported by Windows. Ignoring for now.
180+
}
177181
else if (CFEqual(keyString, CFSTR("WeakLeaf")) || CFEqual(keyString, CFSTR("WeakIntermediates")) ||
178182
CFEqual(keyString, CFSTR("WeakRoot")) || CFEqual(keyString, CFSTR("WeakKeySize")))
179183
{

‎src/System.IO.Packaging/src/System/IO/Packaging/ZipPackagePart.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ protected override Stream GetStreamCore(FileMode streamFileMode, FileAccess stre
2727
{
2828
if (_zipArchiveEntry != null)
2929
{
30-
if (streamFileMode == FileMode.Create)
30+
// Reset the stream when FileMode.Create is specified. Since ZipArchiveEntry only
31+
// ever supports opening once when the backing archive is in Create mode, we'll avoid
32+
// calling SetLength since the stream returned won't be seekable. You could still open
33+
// an archive in Update mode then call part.GetStream(FileMode.Create), in which case
34+
// we'll want this call to SetLength.
35+
if (streamFileMode == FileMode.Create && _zipArchiveEntry.Archive.Mode != ZipArchiveMode.Create)
3136
{
3237
using (var tempStream = _zipStreamManager.Open(_zipArchiveEntry, streamFileMode, streamFileAccess))
3338
{

0 commit comments

Comments
 (0)