Skip to content

Commit 87a0728

Browse files
dseefelddseefeld
authored
Merge pull request #1989 from dseefeld/2.1.24
Update to 2.1.24
2 parents 3a4ebdf + 91b13af commit 87a0728

23 files changed

+206
-51
lines changed

‎BuildToolsVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.0-rc1-03131-06
1+
2.1.0-rc1-06014-01

‎DotnetCLIVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.518
1+
2.1.519

‎NuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
55
<clear />
66
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
7-
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
7+
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
88
</packageSources>
99
</configuration>

‎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/20200921-03/final/index.json
1+
https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20201118-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.23</MicrosoftAspNetCoreAllPackageVersion>
26-
<MicrosoftAspNetCoreAppPackageVersion>2.1.23</MicrosoftAspNetCoreAppPackageVersion>
25+
<MicrosoftAspNetCoreAllPackageVersion>2.1.24</MicrosoftAspNetCoreAllPackageVersion>
26+
<MicrosoftAspNetCoreAppPackageVersion>2.1.24</MicrosoftAspNetCoreAppPackageVersion>
2727
<MicrosoftNETSdkRazorPackageVersion>2.2.0</MicrosoftNETSdkRazorPackageVersion>
2828
</PropertyGroup>
2929

‎init-tools.cmd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\
66
if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools
77
set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\
88
if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe
9-
if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
9+
if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json
10+
set MYGET_LEGACY_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json
1011
set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt"
1112
set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\
1213
set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
@@ -63,8 +64,8 @@ if NOT exist "%DOTNET_LOCAL_PATH%" (
6364

6465
if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore
6566
echo Restoring BuildTools version %BUILDTOOLS_VERSION%...
66-
echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
67-
call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
67+
echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" --source "%MYGET_LEGACY_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
68+
call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" --source "%MYGET_LEGACY_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%"
6869
if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" (
6970
echo ERROR: Could not restore build tools correctly. 1>&2
7071
goto :error

‎init-tools.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ __PACKAGES_DIR="$__scriptpath/packages"
66
__TOOLRUNTIME_DIR="$__scriptpath/Tools"
77
__DOTNET_PATH="$__TOOLRUNTIME_DIR/dotnetcli"
88
__DOTNET_CMD="$__DOTNET_PATH/dotnet"
9-
if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi
9+
if [ -z "${__BUILDTOOLS_SOURCE:-}" ]; then __BUILDTOOLS_SOURCE=https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json; fi
10+
__MYGET_LEGACY_SOURCE=https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json
1011
export __BUILDTOOLS_USE_CSPROJ=true
1112
__BUILD_TOOLS_PACKAGE_VERSION=$(cat "$__scriptpath/BuildToolsVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
1213
__DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/DotnetCLIVersion.txt" | sed 's/\r$//') # remove CR if mounted repo on Windows drive
@@ -145,8 +146,8 @@ fi
145146

146147
if [ ! -e "$__BUILD_TOOLS_PATH" ]; then
147148
echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..."
148-
echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> "$__init_tools_log"
149-
"$__DOTNET_CMD" restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages "$__PACKAGES_DIR" --source "$__BUILDTOOLS_SOURCE" /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir="$__TOOLRUNTIME_DIR" >> "$__init_tools_log"
149+
echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE --source $__MYGET_LEGACY_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> "$__init_tools_log"
150+
"$__DOTNET_CMD" restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages "$__PACKAGES_DIR" --source "$__BUILDTOOLS_SOURCE" --source $__MYGET_LEGACY_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir="$__TOOLRUNTIME_DIR" >> "$__init_tools_log"
150151
if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then
151152
echo "ERROR: Could not restore build tools correctly." 1>&2
152153
display_error_message

‎patches/roslyn-tools/0002-Upate-version-of-roslynTools.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From e5e0ee92573208a64a78a1b146bbf580dea394a8 Mon Sep 17 00:00:00 2001
2+
From: dseefeld <[email protected]>
3+
Date: Thu, 14 Jan 2021 20:34:45 +0000
4+
Subject: [PATCH] Upate version of roslynTools
5+
6+
---
7+
global.json | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/global.json b/global.json
11+
index 56f49ed..6109f8d 100644
12+
--- a/global.json
13+
+++ b/global.json
14+
@@ -3,6 +3,6 @@
15+
"version": "2.1.101"
16+
},
17+
"msbuild-sdks": {
18+
- "RoslynTools.RepoToolset": "1.0.0-beta2-62805-03"
19+
+ "RoslynTools.RepoToolset": "1.0.0-custom-62805-03"
20+
}
21+
}
22+
--
23+
1.8.3.1
24+

‎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>20200922-01</OfficialBuildId>
24+
<OfficialBuildId>20201118-02</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>20200921-03</OfficialBuildId>
21+
<OfficialBuildId>20201118-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>20200921-01</OfficialBuildId>
27+
<OfficialBuildId>20201118-01</OfficialBuildId>
2828
</PropertyGroup>
2929

3030
<ItemGroup>

‎repos/dir.targets

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="GetSourceBuiltNupkgCacheConflicts" />
1111
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="ReadNuGetPackageInfos" />
1212
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="RemoveInternetSourcesFromNuGetConfig" />
13+
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="ReplaceFeedsInFile" />
1314
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="UpdateJson" />
1415
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="ValidateUsageAgainstBaseline" />
1516
<UsingTask AssemblyFile="$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll" TaskName="WriteBuildOutputProps" />
@@ -43,6 +44,13 @@
4344
<NuGetConfigFile Condition="'$(NuGetConfigFile)' == '' and Exists('$(ProjectDirectory)src\NuGet.Config')">$(ProjectDirectory)src\NuGet.Config</NuGetConfigFile>
4445
</PropertyGroup>
4546

47+
<ItemGroup>
48+
<LegacyFeedUpdateFiles Include="$(NuGetConfigFile)" />
49+
<LegacyFeedUpdateFiles Include="$(ProjectDirectory)**\*.props" />
50+
<LegacyFeedUpdateFiles Include="$(ProjectDirectory)**\*.targets" />
51+
<LegacyFeedUpdateFiles Include="$(ProjectDirectory)**\*.proj" />
52+
</ItemGroup>
53+
4654
<!-- Dependency version input arguments -->
4755
<PropertyGroup Condition="'$(DependencyVersionInputRepoApiImplemented)' == 'true'">
4856
<RepoApiArgs>$(RepoApiArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath)</RepoApiArgs>
@@ -155,6 +163,72 @@
155163
SourcePath="$(SourceBuiltPackagesPath)" />
156164
</Target>
157165

166+
<Target Name="UpdateLegacyFeeds"
167+
BeforeTargets="Build;Restore"
168+
Condition="'@(LegacyFeedUpdateFiles)' != ''">
169+
170+
<!-- Update files that have deprecated myget feeds -->
171+
<ItemGroup>
172+
<LegacyFeedMapping
173+
Include="https://dotnet.myget.org/F/nuget-build/api/v3/index.json"
174+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
175+
<LegacyFeedMapping
176+
Include="https://www.myget.org/F/nugetbuild/api/v3/index.json"
177+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
178+
<LegacyFeedMapping
179+
Include="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json"
180+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
181+
<LegacyFeedMapping
182+
Include="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"
183+
NewFeed="https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json" />
184+
<LegacyFeedMapping
185+
Include="https://dotnet.myget.org/F/vstest/api/v3/index.json"
186+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
187+
<LegacyFeedMapping
188+
Include="https://dotnet.myget.org/F/mstestv2/auth/1e768268-8c95-4e7e-9fd2-0eb1b1b69b18/api/v3/index.json"
189+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
190+
<LegacyFeedMapping
191+
Include="https://dotnet.myget.org/F/roslyn/api/v3/index.json"
192+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
193+
<LegacyFeedMapping
194+
Include="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json"
195+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
196+
<LegacyFeedMapping
197+
Include="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json"
198+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
199+
<LegacyFeedMapping
200+
Include="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json"
201+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
202+
<LegacyFeedMapping
203+
Include="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json"
204+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
205+
<LegacyFeedMapping
206+
Include="https://dotnet.myget.org/F/interactive-window/api/v3/index.json"
207+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
208+
<LegacyFeedMapping
209+
Include="https://dotnet.myget.org/F/mstestv2/api/v3/index.json"
210+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
211+
<LegacyFeedMapping
212+
Include="https://dotnet.myget.org/F/vsunittesting/api/v3/index.json"
213+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
214+
<LegacyFeedMapping
215+
Include="https://dotnet.myget.org/F/msbuild/api/v3/index.json"
216+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
217+
<LegacyFeedMapping
218+
Include="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json"
219+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
220+
<LegacyFeedMapping
221+
Include="https://dotnet.myget.org/F/dotnet-core-optimization-data/api/v3/index.json"
222+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
223+
<LegacyFeedMapping
224+
Include="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json"
225+
NewFeed="https://pkgs.dev.azure.com/dnceng/public/_packaging/myget-legacy/nuget/v3/index.json" />
226+
</ItemGroup>
227+
228+
<ReplaceFeedsInFile InputFile="%(LegacyFeedUpdateFiles.Identity)"
229+
FeedMapping="@(LegacyFeedMapping)" />
230+
</Target>
231+
158232
<Target Name="UpdateCLIVersionInGlobalJson"
159233
BeforeTargets="Build"
160234
Condition="'$(GlobalJsonFile)' != ''">

‎repos/roslyn-tools.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" />
44
<PropertyGroup>
5+
<NuGetConfigFile>$(ProjectDirectory)/nuget.config</NuGetConfigFile>
56
<BuildCommand>$(ProjectDirectory)\build$(ShellExtension) $(FlagParameterPrefix)pack $(FlagParameterPrefix)configuration $(Configuration)</BuildCommand>
67
<OrchestratedManifestBuildName>N/A</OrchestratedManifestBuildName>
78
<UsesRepoToolset>true</UsesRepoToolset>

‎smoke-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ function setupDevCerts() {
209209
echo "Setting up dotnet-dev-certs $devCertsVersion to generate dev certificate" | tee -a "$logFile"
210210
(
211211
set -x
212-
"$dotnetDir/dotnet" tool install -g dotnet-dev-certs --version "$devCertsVersion" --add-source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
212+
"$dotnetDir/dotnet" tool install -g dotnet-dev-certs --version "$devCertsVersion" --add-source https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json
213213
export DOTNET_ROOT="$dotnetDir"
214214
"$testingHome/.dotnet/tools/dotnet-dev-certs" https
215215
) >> "$logFile" 2>&1

‎smoke-testNuGet.Config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<clear />
66
<add key="source-built-packages" value="SOURCE_BUILT_PACKAGES" />
77
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
8-
<add key="dotnet.myget.org/feed/dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
8+
<add key="dotnet/feed/dotnet-core" value="https://dotnetmygetlegacy.blob.core.windows.net/dotnet-core/index.json" />
99
<add key="ProdCon" value="PRODUCT_CONTRUCTION_PACKAGES" />
1010
<add key="smoke-test feed" value="SMOKE_TEST_PACKAGE_FEED" />
1111
</packageSources>

‎src/cli

Submodule cli updated 21 files

‎src/core-setup

‎src/coreclr

‎src/corefx

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

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,6 @@
3030
<Dir>bin/obj/</Dir>
3131
<Dir></Dir>
3232
</ProjectDirectories>
33-
<NeverRestoredTarballPrebuilts>
34-
<PackageIdentity Id="Microsoft.DotNet.BuildTools" Version="2.1.0-rc1-03131-06" />
35-
<PackageIdentity Id="RoslynTools.RepoToolset" Version="1.0.0-beta2-62805-03" />
36-
<PackageIdentity Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.1.22" />
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" />
41-
</NeverRestoredTarballPrebuilts>
4233
<Usages>
4334
<Usage Id="fmdev.ResX" Version="0.2.0" />
4435
<Usage Id="fmdev.xlftool" Version="0.1.3" IsDirectDependency="true" />
@@ -217,12 +208,12 @@
217208
<Usage Id="runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.2" Rid="fedora.24-x64" />
218209
<Usage Id="runtime.linux-x64.Microsoft.NETCore.App" Version="2.0.0" Rid="linux-x64" />
219210
<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.22" Rid="linux-x64" />
221-
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.22" Rid="linux-x64" />
211+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="2.1.23" Rid="linux-x64" />
212+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHost" Version="2.1.23" Rid="linux-x64" />
222213
<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.22" Rid="linux-x64" />
214+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" Version="2.1.23" Rid="linux-x64" />
224215
<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.22" Rid="linux-x64" />
216+
<Usage Id="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="2.1.23" Rid="linux-x64" />
226217
<Usage Id="runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" />
227218
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.0" Rid="opensuse.13.2-x64" />
228219
<Usage Id="runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl" Version="4.3.1" Rid="opensuse.13.2-x64" />
@@ -511,4 +502,4 @@
511502
<Usage Id="XliffTasks" Version="0.2.0-beta-62730-03" IsDirectDependency="true" />
512503
<Usage Id="XliffTasks" Version="0.2.0-beta-63004-01" IsDirectDependency="true" />
513504
</Usages>
514-
</UsageData>
505+
</UsageData>

0 commit comments

Comments
 (0)