From 931f79e4670cb73c9347e14714fd892907be6630 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 1 Nov 2019 18:27:23 +0100 Subject: [PATCH] Use Package suffix instead of PackageId and Version suffix instead of PackageVersion (#42289) * Use Package suffix instead of PackageId * Manual darc update from build '20191101.2' --- eng/Tools.props | 12 +-- eng/Version.Details.xml | 80 ++++++++--------- eng/Versions.props | 85 +++++++++---------- eng/analyzers.props | 2 +- eng/codeOptimization.targets | 4 +- eng/common/tools.ps1 | 5 +- eng/common/tools.sh | 6 +- eng/packaging.props | 2 +- eng/restore/docs.targets | 4 +- eng/restore/illink.targets | 4 +- eng/restore/optimizationData.targets | 4 +- global.json | 8 +- .../CoreFx.Private.TestUtilities.csproj | 8 +- .../System/Xml/ModuleCore/ModuleCore.csproj | 4 +- ...cs.Tracing.EventSource.Redist.Tests.csproj | 2 +- ...e.native.System.Data.SqlClient.sni.pkgproj | 6 +- ....ComponentModel.TypeConverter.Tests.csproj | 4 +- .../System.Data.SqlClient.Tests.csproj | 2 +- .../System.Diagnostics.Tracing.Tests.csproj | 2 +- .../tests/System.Drawing.Common.Tests.csproj | 2 +- .../System.IO.Compression.Brotli.Tests.csproj | 2 +- ...System.IO.Compression.ZipFile.Tests.csproj | 2 +- .../tests/System.IO.Compression.Tests.csproj | 2 +- .../tests/System.IO.Packaging.Tests.csproj | 2 +- .../System.Linq.Expressions.Tests.csproj | 2 +- .../System.Net.Http.Functional.Tests.csproj | 2 +- .../tests/System.Net.Requests.Tests.csproj | 2 +- .../System.Net.Security.Tests.csproj | 2 +- .../System.Net.WebSockets.Client.Tests.csproj | 2 +- .../System.Xml.RW.XmlWriterApi.Tests.csproj | 2 +- .../System.Resources.Extensions.Tests.csproj | 2 +- ...Cryptography.X509Certificates.Tests.csproj | 2 +- .../tests/System.Text.Json.Tests.csproj | 2 +- .../System.Windows.Extensions.Tests.csproj | 6 +- .../Microsoft.Private.PackageBaseline.pkgproj | 4 +- src/pkg/frameworkPackage.targets | 6 +- .../netcoreapp5.0/settings.targets | 2 +- .../workaroundDowngrade.targets | 2 +- src/restore/netstandard/netstandard.depproj | 10 +-- src/restore/runtime/runtime.depproj | 14 +-- src/restore/tools/tools.depproj | 4 +- 41 files changed, 157 insertions(+), 163 deletions(-) diff --git a/eng/Tools.props b/eng/Tools.props index 43ad2e8c1331..2afe27d47d1c 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -10,12 +10,12 @@ - - + + - + @@ -24,14 +24,14 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13409e6bd1a1..d818a0261c1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,85 +18,85 @@ - + https://github.com/dotnet/core-setup - 14e7a3b2fb40b377562d3d3e739d471841ae3316 + e460275e7463fdc900bf5c9e0a574ec8946ac6c2 - + https://github.com/dotnet/core-setup - 14e7a3b2fb40b377562d3d3e739d471841ae3316 + e460275e7463fdc900bf5c9e0a574ec8946ac6c2 - + https://github.com/dotnet/core-setup - 14e7a3b2fb40b377562d3d3e739d471841ae3316 + e460275e7463fdc900bf5c9e0a574ec8946ac6c2 - + https://github.com/dotnet/corefx - a24db0ba5666f46f50649810fe698ad267b60331 + dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - + https://github.com/dotnet/corefx - a24db0ba5666f46f50649810fe698ad267b60331 + dd2ad4367bc4e070f3e8ca81ca6421db5733e731 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/standard - a2bca7f4f89c899c2c0325c2790faf6f7d29870c + 1063b6811691a2e009d7733cbf68f897511f00b2 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 - + https://github.com/dotnet/arcade - db50c8d7378a7a81033a1b8fcfa5461694a891c3 + d2d8d9f5c14e353acc7dfcf69c5fa5a8c368af40 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 9af6f5ef4f3b..e99838993739 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,63 +22,60 @@ - NETStandard.Library - optimization.windows_nt-x64.ibc.corefx - optimization.linux-x64.ibc.corefx - microsoft.private.intellisense + netstandard.library + optimization.windows_nt-x64.ibc.corefx + optimization.linux-x64.ibc.corefx + microsoft.private.intellisense - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 2.5.1-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 - 5.0.0-beta.19531.14 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 2.5.1-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 + 5.0.0-beta.19551.2 - 5.0.0-alpha.1.19531.19 - 5.0.0-alpha.1.19531.19 - 5.0.0-alpha.1.19531.19 + 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 - 5.0.0-alpha1.19525.1 - 5.0.0-alpha1.19525.1 - 5.0.0-alpha1.19525.1 + 5.0.0-alpha1.19525.1 + 5.0.0-alpha1.19525.1 + 5.0.0-alpha1.19525.1 - 5.0.0-alpha.1.19531.13 - 5.0.0-alpha.1.19531.13 + 5.0.0-alpha.1.19551.1 + 5.0.0-alpha.1.19551.1 - 2.2.0-prerelease.19531.1 + 2.2.0-prerelease.19551.1 - 99.99.99-master-20190716.1 + 99.99.99-master-20190716.1 - 4.4.0 - 4.4.0 + 4.4.0 + 4.4.0 - 16.2.0 - 2.4.1 - 2.0.5 - 12.0.1 - 3.0.0-preview6-27804-01 + 16.3.0 + 2.4.1 + 2.0.5 + 12.0.1 + 3.0.0-preview6-27804-01 - 1.0.16 - 1.0.4 - 1.0.7 - 1.0.6 - 1.0.4 - 1.0.12 - 1.0.5 - 4.12.0 - - 1.5.0 - 4.1.4 + 1.0.16 + 1.0.4 + 1.0.7 + 1.0.6 + 1.0.4 + 1.0.12 + 1.0.5 + 4.12.0 - 3.0.0-preview9-190909-1 + 3.0.0-preview9-190909-1 - 0.1.6-prerelease.19523.1 + 0.1.6-prerelease.19523.1 diff --git a/eng/analyzers.props b/eng/analyzers.props index 5a52208c44f0..4aa6b3229913 100644 --- a/eng/analyzers.props +++ b/eng/analyzers.props @@ -1,6 +1,6 @@ - + diff --git a/eng/codeOptimization.targets b/eng/codeOptimization.targets index b49f8e52bec5..b46a0f8286a2 100644 --- a/eng/codeOptimization.targets +++ b/eng/codeOptimization.targets @@ -10,8 +10,8 @@ Condition="'$(IsEligibleForNgenOptimization)' == 'true'" BeforeTargets="CoreCompile"> - $(IbcOptimizationDataDir)$(LinuxCoreFxOptimizationDataPackageId)\ - $(IbcOptimizationDataDir)$(WindowsCoreFxOptimizationDataPackageId)\ + $(IbcOptimizationDataDir)$(LinuxCoreFxOptimizationDataPackage)\ + $(IbcOptimizationDataDir)$(WindowsCoreFxOptimizationDataPackage)\ <_optimizationDataAssembly Include="$(IbcOptimizationDataDir)**\$(TargetFileName)" /> diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 3ab5498b7f22..42ca33ac33dc 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -446,10 +446,7 @@ function GetSdkTaskProject([string]$taskName) { } function InitializeNativeTools() { - if ($null -eq $env:DisableNativeToolsetInstalls) { - return - } - if (Get-Member -InputObject $GlobalJson -Name "native-tools") { + if (-Not (Test-Path variable:DisableNativeToolsetInstalls) -And (Get-Member -InputObject $GlobalJson -Name "native-tools")) { $nativeArgs= @{} if ($ci) { $nativeArgs = @{ diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 35a80c3f1233..6a23ac0a3452 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -4,7 +4,7 @@ # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} -disable_configure_toolset_import=${disable_configure_toolset_import:-null} +disable_configure_toolset_import=${disable_configure_toolset_import:-} # Set to true to use the pipelines logger which will enable Azure logging output. # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md @@ -273,7 +273,7 @@ function GetNuGetPackageCachePath { } function InitializeNativeTools() { - if [[ -z "${DisableNativeToolsetInstalls:-}" ]]; then + if [[ -n "${DisableNativeToolsetInstalls:-}" ]]; then return fi if grep -Fq "native-tools" $global_json_file @@ -437,7 +437,7 @@ Write-PipelineSetVariable -name "Temp" -value "$temp_dir" Write-PipelineSetVariable -name "TMP" -value "$temp_dir" # Import custom tools configuration, if present in the repo. -if [[ "$disable_configure_toolset_import" != null ]]; then +if [[ -z "$disable_configure_toolset_import" ]]; then configure_toolset_script="$eng_root/configure-toolset.sh" if [[ -a "$configure_toolset_script" ]]; then . "$configure_toolset_script" diff --git a/eng/packaging.props b/eng/packaging.props index dc94bd727e39..50af85833e76 100644 --- a/eng/packaging.props +++ b/eng/packaging.props @@ -13,7 +13,7 @@ x64 - $(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackageId)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp + $(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackage)/$(MicrosoftPrivateIntellisenseVersion)/xmldocs/netcoreapp diff --git a/eng/restore/docs.targets b/eng/restore/docs.targets index 414f1a597732..61c81ea99a62 100644 --- a/eng/restore/docs.targets +++ b/eng/restore/docs.targets @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ AfterTargets="Restore"> - + $([System.String]::new('%(RecursiveDir)').TrimEnd('\/')) diff --git a/eng/restore/illink.targets b/eng/restore/illink.targets index 137612c58342..aa40e2a2a4e8 100644 --- a/eng/restore/illink.targets +++ b/eng/restore/illink.targets @@ -1,14 +1,14 @@ - + - <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksPackageVersion)\tools\**\*" /> + <_illinkSrcFiles Include="$(NuGetPackageRoot)illink.tasks\$(ILLinkTasksVersion)\tools\**\*" /> - - + + diff --git a/global.json b/global.json index 7961d95098a9..7486bb3a73c0 100644 --- a/global.json +++ b/global.json @@ -8,10 +8,10 @@ "dotnet": "3.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19531.14", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19531.14", - "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19531.14", - "Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19531.14", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19551.2", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19551.2", + "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19551.2", + "Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19551.2", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19525.1" } diff --git a/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj b/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj index e39f68ae9c1a..79b4f3d20509 100644 --- a/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj +++ b/src/Common/tests/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.csproj @@ -73,9 +73,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index ba4906fe49d0..75854e6d41bc 100644 --- a/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -19,7 +19,7 @@ - - + + \ No newline at end of file diff --git a/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj b/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj index 8c1d7fdac9d0..ed97cfd0da1d 100644 --- a/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj +++ b/src/Microsoft.Diagnostics.Tracing.EventSource.Redist/tests/Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj @@ -36,6 +36,6 @@ - + \ No newline at end of file diff --git a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj b/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj index 19cda6742339..2afdca1bfac1 100644 --- a/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj +++ b/src/Native/pkg/runtime.native.System.Data.SqlClient.sni/runtime.native.System.Data.SqlClient.sni.pkgproj @@ -6,13 +6,13 @@ - $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion) + $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion) - $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion) + $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion) - $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion) + $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniVersion) diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj index bce419ea9c47..01ee43a3aa5a 100644 --- a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj +++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj @@ -156,8 +156,8 @@ - - + + diff --git a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj index b6554938d2a3..a72c9b9b83ec 100644 --- a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj +++ b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj @@ -37,6 +37,6 @@ - + \ No newline at end of file diff --git a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj index c0702be89ca1..7b713566d1f9 100644 --- a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj +++ b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj @@ -42,6 +42,6 @@ - + \ No newline at end of file diff --git a/src/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj b/src/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj index 0b648caef580..21d1167d212c 100644 --- a/src/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj +++ b/src/System.Drawing.Common/tests/System.Drawing.Common.Tests.csproj @@ -89,7 +89,7 @@ - + System.Drawing.Tests.48x48_multiple_entries_4bit.ico diff --git a/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index 7a4e95cf632d..1401032ef208 100644 --- a/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -31,7 +31,7 @@ TODO: Remove when macOS 10.12 support ended. --> - + \ No newline at end of file diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 833cd20036bb..81312d13f37a 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -38,7 +38,7 @@ TODO: Remove when macOS 10.12 support ended. --> - + \ No newline at end of file diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 263fd1ecd3be..332bc6f10765 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -52,7 +52,7 @@ TODO: Remove when macOS 10.12 support ended. --> - + \ No newline at end of file diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index 3afc95abbc61..759191c71aae 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -6,6 +6,6 @@ - + \ No newline at end of file diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index db9c2ea83989..75ae385f6e16 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -246,6 +246,6 @@ - + diff --git a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index fbcdc446c243..e6067c30c0e1 100644 --- a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -178,7 +178,7 @@ - + diff --git a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj index cecca4d63a04..909d883dd2d1 100644 --- a/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj +++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.csproj @@ -43,6 +43,6 @@ - + diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 390082bab70f..483512ead67e 100644 --- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -157,7 +157,7 @@ - + diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 90e9f0f4bbb2..8fa8499b89ff 100644 --- a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -60,6 +60,6 @@ - + diff --git a/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj b/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj index 013335886acf..02d0b53e6b85 100644 --- a/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Writers/XmlWriterApi/System.Xml.RW.XmlWriterApi.Tests.csproj @@ -43,6 +43,6 @@ - + \ No newline at end of file diff --git a/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj index 7aef5b0b33cb..c5fca45986d9 100644 --- a/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +++ b/src/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj @@ -20,7 +20,7 @@ - + - + diff --git a/src/restore/netstandard/netstandard.depproj b/src/restore/netstandard/netstandard.depproj index dbde334f6454..7a4c07c2c59c 100644 --- a/src/restore/netstandard/netstandard.depproj +++ b/src/restore/netstandard/netstandard.depproj @@ -10,7 +10,7 @@ - $(NETStandardLibraryPackageVersion) + $(NETStandardLibraryVersion) @@ -77,7 +77,7 @@ - <_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref + <_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard2.1\ref @@ -102,7 +102,7 @@ - <_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref + <_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\$(_NETStandardTFMFolder)\ref @@ -117,8 +117,8 @@ False - $(NETStandardLibraryPackageId) - $(NETStandardLibraryPackageVersion) + $(NETStandardLibraryPackage) + $(NETStandardLibraryVersion) diff --git a/src/restore/runtime/runtime.depproj b/src/restore/runtime/runtime.depproj index 421434766c7a..3102905a0912 100644 --- a/src/restore/runtime/runtime.depproj +++ b/src/restore/runtime/runtime.depproj @@ -13,17 +13,17 @@ - 3.0.0-rc2.19462.14 + 3.0.0-rc2.19462.14 4.6.0-rc2.19462.14 - - - - - - + + + + + + diff --git a/src/restore/tools/tools.depproj b/src/restore/tools/tools.depproj index 579af95223f5..5ddb582b3598 100644 --- a/src/restore/tools/tools.depproj +++ b/src/restore/tools/tools.depproj @@ -8,10 +8,10 @@ - $(MicrosoftNETCoreILAsmPackageVersion) + $(MicrosoftNETCoreILAsmVersion) - $(MicrosoftNETCoreILAsmPackageVersion) + $(MicrosoftNETCoreILAsmVersion) \ No newline at end of file