Skip to content

Commit 65f91b6

Browse files
dagooddagood
authored
Merge pull request #1662 from dagood/2.1.20
2 parents 0c69ecf + b52e26b commit 65f91b6

15 files changed

+91
-80
lines changed

‎.vsts.pipelines/jobs/ci-linux.yml

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -81,32 +81,24 @@ jobs:
8181
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
8282
displayName: Run smoke-test
8383
84-
# Copy source-buid logs
84+
# Copy source-build logs
8585
- script: |
8686
set -x
87+
logDir=/logs/source-build/logs
8788
$(docker.run) $(docker.logs.map) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
88-
mkdir -p /logs/source-build/logs
89-
find \"\$PWD\" \( \
89+
mkdir -p $logDir
90+
find \"\$PWD\" \
91+
-depth \
92+
\( \
9093
-path './bin/*-report/*' -o \
9194
-path './bin/msbuild-debug/*' -o \
9295
-iname '*.binlog' -o \
93-
-iname '*.log' \) \
94-
-exec cp {} --parents /logs/source-build/logs \;"
95-
displayName: Copy source-build logs
96-
condition: always()
97-
continueOnError: true
98-
99-
# Delete local copy of source-build logs
100-
- script: |
101-
set -x
102-
$(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
103-
find \"\$PWD\" \( \
104-
-path './bin/*-report/*' -o \
105-
-path './bin/msbuild-debug/*' -o \
106-
-iname '*.binlog' -o \
107-
-iname '*.log' \) \
96+
-iname '*.log' \
97+
\) \
98+
-exec echo Copying and removing {} \; \
99+
-exec cp {} --parents $logDir \; \
108100
-exec rm -rf {} \;"
109-
displayName: Remove source-build logs
101+
displayName: Copy source-build logs
110102
condition: always()
111103
continueOnError: true
112104
@@ -187,31 +179,22 @@ jobs:
187179
# Copy tarball logs and reports to staging directory.
188180
- script: |
189181
set -x
182+
logDir=/logs/tarball/logs
190183
$(docker.run) $(docker.logs.map) $(docker.tb.map) $(docker.tb.work) $(imageName) /bin/bash -c "
191-
mkdir -p /logs/tarball/logs
184+
mkdir -p $logDir
192185
cd \"$(tarballName)\"
193-
find \"\$PWD\" \( \
186+
find \"\$PWD\" \
187+
-depth \
188+
\( \
194189
-path './bin/*-report/*' -o \
195190
-path './bin/msbuild-debug/*' -o \
196191
-iname '*.binlog' -o \
197-
-iname '*.log' \) \
198-
-exec cp {} --parents /logs/tarball/logs \;"
199-
displayName: Copy tarball logs
200-
condition: eq(variables['sb.tarball'], true)
201-
continueOnError: true
202-
203-
# Remove tarball logs and reports
204-
- script: |
205-
set -x
206-
$(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) /bin/bash -c "
207-
cd \"$(tarballName)\"
208-
find \"\$PWD\" \( \
209-
-path './bin/*-report/*' -o \
210-
-path './bin/msbuild-debug/*' -o \
211-
-iname '*.binlog' -o \
212-
-iname '*.log' \) \
192+
-iname '*.log' \
193+
\) \
194+
-exec echo Copying and removing {} \; \
195+
-exec cp {} --parents $logDir \; \
213196
-exec rm -rf {} \;"
214-
displayName: Remove tarball logs
197+
displayName: Copy tarball logs
215198
condition: eq(variables['sb.tarball'], true)
216199
continueOnError: true
217200

‎ProdConFeed.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200528-01/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200617-01/final/index.json

‎dependencies.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
the product as version strings to be used by the SDK to fetch extra content.
2323
-->
2424
<PropertyGroup>
25-
<MicrosoftAspNetCoreAllPackageVersion>2.1.19</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.19</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.20</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.20</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

‎patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@ Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in
77

88
https://github.com/dotnet/cli/issues/9469 is required to remove this patch.
99
---
10-
build/MSBuildExtensions.targets | 14 +++++++++++---
11-
1 file changed, 11 insertions(+), 3 deletions(-)
10+
build/MSBuildExtensions.targets | 8 ++++++++
11+
1 file changed, 8 insertions(+)
1212

1313
diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
14-
index 73b6f88a2..6fc609c30 100644
14+
index 2c1e3b733..36a63ffa9 100644
1515
--- a/build/MSBuildExtensions.targets
1616
+++ b/build/MSBuildExtensions.targets
17-
@@ -199,9 +199,17 @@ Copyright (c) .NET Foundation. All rights reserved.
18-
<DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>
19-
20-
<!-- Latest patch versions for each minor version of .NET Core -->
21-
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
22-
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
23-
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
17+
@@ -202,6 +202,14 @@ Copyright (c) .NET Foundation. All rights reserved.
18+
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
19+
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
20+
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
2421
+
2522
+ <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.
2623
+ Normally, a published application will use the latest patch version of the shared ASP.NET framework.
@@ -33,5 +30,5 @@ index 73b6f88a2..6fc609c30 100644
3330
</Project>
3431
]]>
3532
--
36-
2.21.0
33+
2.26.2.windows.1
3734

‎patches/cli/0003-Remove-System.Security.Principal.Windows-nupkg-ref.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From ecc45d979c7f44014b43dce91e943f7d6e32bfbd Mon Sep 17 00:00:00 2001
2+
From: Davis Goodin <dagood@microsoft.com>
3+
Date: Tue, 23 Jun 2020 18:20:35 -0500
4+
Subject: [PATCH] Remove System.Security.Principal.Windows nupkg ref
5+
6+
This package is available in the sharedfx and isn't necessary as a package
7+
reference. The package ref blocks source build because it uses version 4.7.0,
8+
built in the 3.1 release and not available for 2.1 source-build.
9+
10+
This fix is in PR in the upstream repo: https://github.com/dotnet/cli/pull/13408
11+
---
12+
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 -
13+
1 file changed, 1 deletion(-)
14+
15+
diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
16+
index 575160565..6cade3da0 100644
17+
--- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
18+
+++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
19+
@@ -26,7 +26,6 @@
20+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
21+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
22+
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
23+
- <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
24+
</ItemGroup>
25+
26+
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
27+
--
28+
2.26.2.windows.1
29+

‎repos/cli.proj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
<RepoApiImplemented>false</RepoApiImplemented>
5050
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>
5151

52+
<OrchestratedManifestBuildName>cli215xx</OrchestratedManifestBuildName>
53+
5254
<EnvironmentExternalRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentExternalRestoreSources>
5355
<EnvironmentExternalRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentExternalRestoreSources>
5456
</PropertyGroup>

‎repos/core-setup.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
2222
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
2323

24-
<OfficialBuildId>20200528-01</OfficialBuildId>
24+
<OfficialBuildId>20200619-01</OfficialBuildId>
2525

2626
<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
2727
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>

‎repos/coreclr.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>
1919

2020
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
21-
<OfficialBuildId>20200528-01</OfficialBuildId>
21+
<OfficialBuildId>20200617-01</OfficialBuildId>
2222
</PropertyGroup>
2323

2424
<ItemGroup>

‎repos/corefx.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
2626
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
27-
<OfficialBuildId>20200528-04</OfficialBuildId>
27+
<OfficialBuildId>20200618-12</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎src/cli

‎src/core-setup

‎src/coreclr

‎src/corefx

Submodule corefx updated 21 files

‎tools-local/prebuilt-baseline-offline.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131
<Dir></Dir>
3232
</ProjectDirectories>
3333
<NeverRestoredTarballPrebuilts>
34-
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.2.0-preview1-03415-02" />
34+
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-03131-06" />
3535
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
3636
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" />
37-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" />
38-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" />
39-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" />
40-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.2.2-servicing-27317-07" />
37+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" />
38+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" />
39+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" />
40+
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.1.8-servicing-27317-03" />
4141
</NeverRestoredTarballPrebuilts>
4242
<Usages>
4343
<Usage Id="fmdev.ResX" Version="0.2.0" />
@@ -217,12 +217,12 @@
217217
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
218218
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
219219
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
220-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.17" Rid="linux-x64" />
221-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.17" Rid="linux-x64" />
220+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
221+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
222222
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
223-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" Rid="linux-x64" />
223+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
224224
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
225-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" Rid="linux-x64" />
225+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
226226
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
227227
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
228228
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />

‎tools-local/prebuilt-baseline-online.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
9696
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
9797
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
98-
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.19" />
99-
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.19" />
100-
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.19" />
98+
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.20" />
99+
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.20" />
100+
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.20" />
101101
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
102102
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
103103
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
@@ -122,24 +122,24 @@
122122
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
123123
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
124124
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
125-
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.17" />
125+
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.19" />
126126
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
127127
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
128-
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.17" IsDirectDependency="true" />
128+
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.19" IsDirectDependency="true" />
129129
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
130130
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
131131
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
132132
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
133133
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
134134
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
135135
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
136-
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" IsDirectDependency="true" />
136+
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" IsDirectDependency="true" />
137137
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
138138
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
139139
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
140140
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
141141
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
142-
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" />
142+
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" />
143143
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
144144
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
145145
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
@@ -273,12 +273,12 @@
273273
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
274274
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
275275
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
276-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.17" Rid="linux-x64" />
277-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.17" Rid="linux-x64" />
276+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
277+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
278278
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
279-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" Rid="linux-x64" />
279+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
280280
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
281-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" Rid="linux-x64" />
281+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
282282
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
283283
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
284284
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
@@ -448,7 +448,7 @@
448448
<Usage Id="System.IO.Compression.ZipFile" Version="4.0.1" />
449449
<Usage Id="System.IO.Compression.ZipFile" Version="4.3.0" />
450450
<Usage Id="System.IO.FileSystem" Version="4.0.1" />
451-
<Usage Id="System.IO.FileSystem" Version="4.3.0" IsDirectDependency="true" />
451+
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
452452
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
453453
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
454454
<Usage Id="System.IO.FileSystem.Watcher" Version="4.0.0" />

0 commit comments

Comments
 (0)