Skip to content

Commit

Permalink
Merge pull request #1662 from dagood/2.1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@dagood
dagood authored Jul 14, 2020
2 parents 0c69ecf + b52e26b commit 65f91b6
Show file tree
Hide file tree
Showing 15 changed files with 91 additions and 80 deletions.
59 changes: 21 additions & 38 deletions .vsts.pipelines/jobs/ci-linux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,32 +81,24 @@ jobs:
/p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix)
displayName: Run smoke-test
# Copy source-buid logs
# Copy source-build logs
- script: |
set -x
logDir=/logs/source-build/logs
$(docker.run) $(docker.logs.map) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
mkdir -p /logs/source-build/logs
find \"\$PWD\" \( \
mkdir -p $logDir
find \"\$PWD\" \
-depth \
\( \
-path './bin/*-report/*' -o \
-path './bin/msbuild-debug/*' -o \
-iname '*.binlog' -o \
-iname '*.log' \) \
-exec cp {} --parents /logs/source-build/logs \;"
displayName: Copy source-build logs
condition: always()
continueOnError: true
# Delete local copy of source-build logs
- script: |
set -x
$(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) /bin/bash -c "
find \"\$PWD\" \( \
-path './bin/*-report/*' -o \
-path './bin/msbuild-debug/*' -o \
-iname '*.binlog' -o \
-iname '*.log' \) \
-iname '*.log' \
\) \
-exec echo Copying and removing {} \; \
-exec cp {} --parents $logDir \; \
-exec rm -rf {} \;"
displayName: Remove source-build logs
displayName: Copy source-build logs
condition: always()
continueOnError: true
Expand Down Expand Up @@ -187,31 +179,22 @@ jobs:
# Copy tarball logs and reports to staging directory.
- script: |
set -x
logDir=/logs/tarball/logs
$(docker.run) $(docker.logs.map) $(docker.tb.map) $(docker.tb.work) $(imageName) /bin/bash -c "
mkdir -p /logs/tarball/logs
mkdir -p $logDir
cd \"$(tarballName)\"
find \"\$PWD\" \( \
find \"\$PWD\" \
-depth \
\( \
-path './bin/*-report/*' -o \
-path './bin/msbuild-debug/*' -o \
-iname '*.binlog' -o \
-iname '*.log' \) \
-exec cp {} --parents /logs/tarball/logs \;"
displayName: Copy tarball logs
condition: eq(variables['sb.tarball'], true)
continueOnError: true
# Remove tarball logs and reports
- script: |
set -x
$(docker.run) $(docker.tb.map) $(docker.tb.work) $(imageName) /bin/bash -c "
cd \"$(tarballName)\"
find \"\$PWD\" \( \
-path './bin/*-report/*' -o \
-path './bin/msbuild-debug/*' -o \
-iname '*.binlog' -o \
-iname '*.log' \) \
-iname '*.log' \
\) \
-exec echo Copying and removing {} \; \
-exec cp {} --parents $logDir \; \
-exec rm -rf {} \;"
displayName: Remove tarball logs
displayName: Copy tarball logs
condition: eq(variables['sb.tarball'], true)
continueOnError: true
Expand Down
2 changes: 1 addition & 1 deletion ProdConFeed.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200528-01/final/index.json
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200617-01/final/index.json
4 changes: 2 additions & 2 deletions dependencies.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
the product as version strings to be used by the SDK to fetch extra content.
-->
<PropertyGroup>
<MicrosoftAspNetCoreAllPackageVersion>2.1.19</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.19</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.1.20</MicrosoftAspNetCoreAllPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>2.1.20</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
</PropertyGroup>

Expand Down
19 changes: 8 additions & 11 deletions patches/cli/0001-Persist-ASP.NET-runtime-patch-targeting-default.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ Let the CLI build take a default value for TargetLatestAspNetCoreRuntimePatch in

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

diff --git a/build/MSBuildExtensions.targets b/build/MSBuildExtensions.targets
index 73b6f88a2..6fc609c30 100644
index 2c1e3b733..36a63ffa9 100644
--- a/build/MSBuildExtensions.targets
+++ b/build/MSBuildExtensions.targets
@@ -199,9 +199,17 @@ Copyright (c) .NET Foundation. All rights reserved.
<DefaultPatchVersionForAspNetCoreApp2_1>$(_DefaultPatchVersionForAspNetCoreApp2_1)</DefaultPatchVersionForAspNetCoreApp2_1>

<!-- Latest patch versions for each minor version of .NET Core -->
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
@@ -202,6 +202,14 @@ Copyright (c) .NET Foundation. All rights reserved.
<LatestPatchVersionForNetCore1_0 Condition="'%24(LatestPatchVersionForNetCore1_0)' == ''">$(MicrosoftNETCoreAppLatestVersion1_0)</LatestPatchVersionForNetCore1_0>
<LatestPatchVersionForNetCore1_1 Condition="'%24(LatestPatchVersionForNetCore1_1)' == ''">$(MicrosoftNETCoreAppLatestVersion1_1)</LatestPatchVersionForNetCore1_1>
<LatestPatchVersionForNetCore2_0 Condition="'%24(LatestPatchVersionForNetCore2_0)' == ''">$(MicrosoftNETCoreAppLatestVersion2_0)</LatestPatchVersionForNetCore2_0>
+
+ <!-- In source-build, override the default behavior to always target the latest ASP.NET Core runtime.
+ Normally, a published application will use the latest patch version of the shared ASP.NET framework.
Expand All @@ -33,5 +30,5 @@ index 73b6f88a2..6fc609c30 100644
</Project>
]]>
--
2.21.0
2.26.2.windows.1

29 changes: 29 additions & 0 deletions patches/cli/0003-Remove-System.Security.Principal.Windows-nupkg-ref.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
From ecc45d979c7f44014b43dce91e943f7d6e32bfbd Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 23 Jun 2020 18:20:35 -0500
Subject: [PATCH] Remove System.Security.Principal.Windows nupkg ref

This package is available in the sharedfx and isn't necessary as a package
reference. The package ref blocks source build because it uses version 4.7.0,
built in the 3.1 release and not available for 2.1 source-build.

This fix is in PR in the upstream repo: https://github.com/dotnet/cli/pull/13408
---
src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 -
1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index 575160565..6cade3da0 100644
--- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -26,7 +26,6 @@
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCorePackageVersion)" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="XliffTasks" Version="$(XliffTasksPackageVersion)" PrivateAssets="All" />
- <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
--
2.26.2.windows.1

2 changes: 2 additions & 0 deletions repos/cli.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
<RepoApiImplemented>false</RepoApiImplemented>
<SourceOverrideRepoApiImplemented>true</SourceOverrideRepoApiImplemented>

<OrchestratedManifestBuildName>cli215xx</OrchestratedManifestBuildName>

<EnvironmentExternalRestoreSources>$(SourceBuiltPackagesPath)</EnvironmentExternalRestoreSources>
<EnvironmentExternalRestoreSources Condition="'$(OfflineBuild)' == 'true'">$(EnvironmentExternalRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)</EnvironmentExternalRestoreSources>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/core-setup.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<BuildCommand>$(ProjectDirectory)/build$(ShellExtension) $(BuildArguments)</BuildCommand>
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<OfficialBuildId>20200528-01</OfficialBuildId>
<OfficialBuildId>20200619-01</OfficialBuildId>

<!-- Need to set $(PackagesOutput) so WriteVersions writes the versions file for cli, until cli respects auto-dependency flow -->
<PackagesOutput>$(SourceBuiltPackagesPath)</PackagesOutput>
Expand Down
2 changes: 1 addition & 1 deletion repos/coreclr.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<BuildCommand Condition="$(Platform.Contains('arm'))">$(ArmEnvironmentVariables) $(BuildCommand)</BuildCommand>

<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20200528-01</OfficialBuildId>
<OfficialBuildId>20200617-01</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion repos/corefx.proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<PackagesOutput>$(ProjectDirectory)/bin/packages/$(Configuration)</PackagesOutput>
<CleanCommand>$(ProjectDirectory)/clean$(ShellExtension)</CleanCommand>
<OfficialBuildId>20200528-04</OfficialBuildId>
<OfficialBuildId>20200618-12</OfficialBuildId>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/cli
Submodule cli updated 15 files
+72 −0 .vsts-ci.yml
+2 −2 build/DependencyVersions.props
+1 −1 build/Version.props
+8 −0 packaging/windows/clisdk/dotnet.wxs
+7 −0 packaging/windows/clisdk/generatenupkg.ps1
+75 −0 src/Microsoft.DotNet.Cli.Utils/DotDefaultPathCorrector.cs
+18 −0 src/Microsoft.DotNet.Cli.Utils/IWindowsRegistryEnvironmentPathEditor.cs
+1 −0 src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+72 −0 src/Microsoft.DotNet.Cli.Utils/WindowsRegistryEnvironmentPathEditor.cs
+16 −5 src/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs
+10 −5 src/dotnet/Program.cs
+32 −7 src/dotnet/ShellShim/EnvironmentPathFactory.cs
+48 −21 src/dotnet/ShellShim/WindowsEnvironmentPath.cs
+68 −0 test/Microsoft.DotNet.Cli.Utils.Tests/DotDefaultPathCorrectorTests.cs
+177 −120 test/Microsoft.DotNet.ShellShim.Tests/WindowsEnvironmentPathTests.cs
2 changes: 1 addition & 1 deletion src/core-setup
Submodule core-setup updated 9 files
+1 −1 BranchInfo.props
+1 −1 buildpipeline/Core-Setup-Linux-Arm-BT.json
+1 −1 buildpipeline/Core-Setup-Linux-BT.json
+1 −1 buildpipeline/Core-Setup-OSX-BT.json
+1 −1 buildpipeline/Core-Setup-Publish.json
+1 −1 buildpipeline/Core-Setup-Signing-Validation.json
+2 −2 buildpipeline/Core-Setup-Windows-Arm-BT.json
+2 −2 buildpipeline/Core-Setup-Windows-BT.json
+4 −4 dependencies.props
2 changes: 1 addition & 1 deletion src/coreclr
Submodule coreclr updated 8 files
+1 −1 ILAsmVersion.txt
+5 −5 dependencies.props
+2 −0 src/debug/createdump/createdump.h
+3 −3 src/inc/slist.h
+7 −1 src/pal/inc/mbusafecrt.h
+56 −51 src/pal/inc/pal.h
+18 −18 src/pal/src/cruntime/math.cpp
+1 −1 src/pal/src/safecrt/memcpy_s.cpp
2 changes: 1 addition & 1 deletion src/corefx
Submodule corefx updated 21 files
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Linux-Crossbuild.json
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Linux.json
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Windows-NoTest.json
+1 −1 buildpipeline/DotNet-CoreFx-Trusted-Windows.json
+2 −2 buildpipeline/DotNet-Trusted-Publish-Symbols.json
+2 −2 buildpipeline/DotNet-Trusted-Publish.json
+2 −2 buildpipeline/DotNet-Trusted-Tests-Publish.json
+8 −8 dependencies.props
+1 −0 src/System.Data.Common/src/Resources/Strings.resx
+4 −0 src/System.Data.Common/src/System.Data.Common.csproj
+3 −0 src/System.Data.Common/src/System/Data/Common/ObjectStorage.cs
+1 −0 src/System.Data.Common/src/System/Data/DataColumn.cs
+1 −0 src/System.Data.Common/src/System/Data/DataException.cs
+6 −0 src/System.Data.Common/src/System/Data/DataSet.cs
+6 −0 src/System.Data.Common/src/System/Data/DataTable.cs
+12 −0 src/System.Data.Common/src/System/Data/Filter/FunctionNode.cs
+18 −0 src/System.Data.Common/src/System/Data/LocalAppContextSwitches.cs
+297 −0 src/System.Data.Common/src/System/Data/TypeLimiter.cs
+1 −0 src/System.Data.Common/tests/System.Data.Common.Tests.csproj
+404 −0 src/System.Data.Common/tests/System/Data/RestrictedTypeHandlingTests.netcoreapp.cs
+1 −1 tools-local/ILAsmVersion.txt
18 changes: 9 additions & 9 deletions tools-local/prebuilt-baseline-offline.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
<Dir></Dir>
</ProjectDirectories>
<NeverRestoredTarballPrebuilts>
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.2.0-preview1-03415-02" />
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-03131-06" />
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.2.2-servicing-27317-07" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.2.2-servicing-27317-07" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.2.2-servicing-27317-07" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.2.2-servicing-27317-07" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" />
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.Runtime.CoreCLR" Version="2.1.8-servicing-27317-03" />
</NeverRestoredTarballPrebuilts>
<Usages>
<Usage Id="fmdev.ResX" Version="0.2.0" />
Expand Down Expand Up @@ -217,12 +217,12 @@
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />
Expand Down
24 changes: 12 additions & 12 deletions tools-local/prebuilt-baseline-online.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<Usage Id="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0-preview2-26306-03" />
<Usage Id="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4-20181009-2100240" />
<Usage Id="Microsoft.DotNet.VersionTools" Version="2.1.0-rc1-05113-01" IsDirectDependency="true" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.19" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.19" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.19" />
<Usage Id="Microsoft.DotNet.Web.ItemTemplates" Version="2.1.20" />
<Usage Id="Microsoft.DotNet.Web.ProjectTemplates.2.1" Version="2.1.20" />
<Usage Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.2.1" Version="2.1.20" />
<Usage Id="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.CommandLineUtils.Sources" Version="2.2.0-rtm-35542" IsDirectDependency="true" />
<Usage Id="Microsoft.Extensions.DependencyModel" Version="1.0.3" />
Expand All @@ -122,24 +122,24 @@
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.17" />
<Usage Id="Microsoft.NETCore.DotNetAppHost" Version="2.1.19" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.17" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHost" Version="2.1.19" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.3" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.0.5" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="1.1.2" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.0.1" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="1.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0-preview1-26116-04" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.0" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" />
<Usage Id="Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" />
<Usage Id="Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" IsDirectDependency="true" />
<Usage Id="Microsoft.NETCore.Jit" Version="1.0.5" />
Expand Down Expand Up @@ -273,12 +273,12 @@
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.8" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.0.0" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.17" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.19" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.ILDAsm" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
<Usage Id="runtime.linux-x64.Microsoft.NETCore.Jit" Version="2.1.8-servicing-27317-03" Rid="linux-x64" />
Expand Down Expand Up @@ -448,7 +448,7 @@
<Usage Id="System.IO.Compression.ZipFile" Version="4.0.1" />
<Usage Id="System.IO.Compression.ZipFile" Version="4.3.0" />
<Usage Id="System.IO.FileSystem" Version="4.0.1" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" IsDirectDependency="true" />
<Usage Id="System.IO.FileSystem" Version="4.3.0" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.0.1" />
<Usage Id="System.IO.FileSystem.Primitives" Version="4.3.0" />
<Usage Id="System.IO.FileSystem.Watcher" Version="4.0.0" />
Expand Down

0 comments on commit 65f91b6

Please sign in to comment.