Skip to content

Commit d6198f9

Browse files
dsplaisteddsplaisted
authored
Merge pull request #2287 from dotnet/merges/release/2.1.4xx-to-master
Merge release/2.1.4xx to master
2 parents d6ad245 + 96cbf3b commit d6198f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3343
-4282
lines changed

‎build/Versions.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<MicrosoftExtensionsDependencyModelVersion>2.1.0-preview2-26306-03</MicrosoftExtensionsDependencyModelVersion>
2020
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
2121
<NewtonsoftJsonVersion>9.0.1</NewtonsoftJsonVersion>
22-
<NuGetBuildTasksPackVersion>4.7.0-rtm.5148</NuGetBuildTasksPackVersion>
22+
<NuGetBuildTasksPackVersion>4.8.0-preview1.5213</NuGetBuildTasksPackVersion>
2323
<NuGetPackagingVersion>$(NuGetBuildTasksPackVersion)</NuGetPackagingVersion>
2424
<NuGetProjectModelVersion>$(NuGetBuildTasksPackVersion)</NuGetProjectModelVersion>
2525
<PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
@@ -38,7 +38,8 @@
3838
<PropertyGroup>
3939
<RestoreSources>
4040
$(RestoreSources);
41-
https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json
41+
https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json;
42+
https://dotnet.myget.org/F/nuget-build/api/v3/index.json
4243
</RestoreSources>
4344
</PropertyGroup>
4445
</Project>

‎build/sdktests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Param(
1111
Set-StrictMode -Version 2.0
1212
$ErrorActionPreference = "Stop"
1313

14-
$lkgPackageVersion = "1.0.0-preview-62916-01"
14+
$lkgPackageVersion = "1.0.0-preview-62918-03"
1515

1616
if ($packageVersion -eq "")
1717
{

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "2.2.100-preview1-008636"
3+
"version": "2.2.100-preview1-008941"
44
},
55
"msbuild-sdks": {
66
"RoslynTools.RepoToolset": "1.0.0-beta2-62912-01"

‎sdk.sln‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -42,56 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{22AB674F-ED9
4242
EndProject
4343
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}"
4444
EndProject
45-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{09AD2F74-FAB2-40C8-B524-3319C3112690}"
46-
ProjectSection(SolutionItems) = preProject
47-
src\Tasks\Common\BuildErrorException.cs = src\Tasks\Common\BuildErrorException.cs
48-
src\Tasks\Common\DiagnosticMessageSeverity.cs = src\Tasks\Common\DiagnosticMessageSeverity.cs
49-
src\Tasks\Common\DiagnosticsHelper.cs = src\Tasks\Common\DiagnosticsHelper.cs
50-
src\Tasks\Common\FileUtilities.cs = src\Tasks\Common\FileUtilities.cs
51-
src\Tasks\Common\FileUtilities.MetadataReader.cs = src\Tasks\Common\FileUtilities.MetadataReader.cs
52-
src\Tasks\Common\ILog.cs = src\Tasks\Common\ILog.cs
53-
src\Tasks\Common\ItemUtilities.cs = src\Tasks\Common\ItemUtilities.cs
54-
src\Tasks\Common\MessageBase.cs = src\Tasks\Common\MessageBase.cs
55-
src\Tasks\Common\MetadataKeys.cs = src\Tasks\Common\MetadataKeys.cs
56-
src\Tasks\Common\MSBuildLog.cs = src\Tasks\Common\MSBuildLog.cs
57-
src\Tasks\Common\NETSdkError.cs = src\Tasks\Common\NETSdkError.cs
58-
src\Tasks\Common\NuGetUtils.cs = src\Tasks\Common\NuGetUtils.cs
59-
src\Tasks\Common\TaskBase.cs = src\Tasks\Common\TaskBase.cs
60-
EndProjectSection
61-
EndProject
62-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{7D6CD7B6-0237-40DD-9911-44FF22292131}"
63-
ProjectSection(SolutionItems) = preProject
64-
src\Tasks\Common\Resources\Strings.resx = src\Tasks\Common\Resources\Strings.resx
65-
EndProjectSection
66-
EndProject
67-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xlf", "xlf", "{C6E91BB1-658C-4E10-9DBA-1C10B7558EFB}"
68-
ProjectSection(SolutionItems) = preProject
69-
src\Tasks\Common\Resources\xlf\Strings.cs.xlf = src\Tasks\Common\Resources\xlf\Strings.cs.xlf
70-
src\Tasks\Common\Resources\xlf\Strings.de.xlf = src\Tasks\Common\Resources\xlf\Strings.de.xlf
71-
src\Tasks\Common\Resources\xlf\Strings.es.xlf = src\Tasks\Common\Resources\xlf\Strings.es.xlf
72-
src\Tasks\Common\Resources\xlf\Strings.fr.xlf = src\Tasks\Common\Resources\xlf\Strings.fr.xlf
73-
src\Tasks\Common\Resources\xlf\Strings.it.xlf = src\Tasks\Common\Resources\xlf\Strings.it.xlf
74-
src\Tasks\Common\Resources\xlf\Strings.ja.xlf = src\Tasks\Common\Resources\xlf\Strings.ja.xlf
75-
src\Tasks\Common\Resources\xlf\Strings.ko.xlf = src\Tasks\Common\Resources\xlf\Strings.ko.xlf
76-
src\Tasks\Common\Resources\xlf\Strings.pl.xlf = src\Tasks\Common\Resources\xlf\Strings.pl.xlf
77-
src\Tasks\Common\Resources\xlf\Strings.pt-BR.xlf = src\Tasks\Common\Resources\xlf\Strings.pt-BR.xlf
78-
src\Tasks\Common\Resources\xlf\Strings.ru.xlf = src\Tasks\Common\Resources\xlf\Strings.ru.xlf
79-
src\Tasks\Common\Resources\xlf\Strings.tr.xlf = src\Tasks\Common\Resources\xlf\Strings.tr.xlf
80-
src\Tasks\Common\Resources\xlf\Strings.zh-Hans.xlf = src\Tasks\Common\Resources\xlf\Strings.zh-Hans.xlf
81-
src\Tasks\Common\Resources\xlf\Strings.zh-Hant.xlf = src\Tasks\Common\Resources\xlf\Strings.zh-Hant.xlf
82-
EndProjectSection
83-
EndProject
84-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConflictResolution", "ConflictResolution", "{B012211C-E8EB-4BA5-B100-D1EAB5ED316E}"
85-
ProjectSection(SolutionItems) = preProject
86-
src\Tasks\Common\ConflictResolution\ConflictItem.cs = src\Tasks\Common\ConflictResolution\ConflictItem.cs
87-
src\Tasks\Common\ConflictResolution\ConflictResolver.cs = src\Tasks\Common\ConflictResolution\ConflictResolver.cs
88-
src\Tasks\Common\ConflictResolution\MetadataNames.cs = src\Tasks\Common\ConflictResolution\MetadataNames.cs
89-
src\Tasks\Common\ConflictResolution\MSBuildUtilities.cs = src\Tasks\Common\ConflictResolution\MSBuildUtilities.cs
90-
src\Tasks\Common\ConflictResolution\PackageRank.cs = src\Tasks\Common\ConflictResolution\PackageRank.cs
91-
src\Tasks\Common\ConflictResolution\PlatformManifestReader.cs = src\Tasks\Common\ConflictResolution\PlatformManifestReader.cs
92-
src\Tasks\Common\ConflictResolution\ResolvePackageFileConflicts.cs = src\Tasks\Common\ConflictResolution\ResolvePackageFileConflicts.cs
93-
EndProjectSection
94-
EndProject
9545
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Extensions.Tasks", "src\Tasks\Microsoft.NET.Build.Extensions.Tasks\Microsoft.NET.Build.Extensions.Tasks.csproj", "{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5}"
9646
EndProject
9747
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Extensions.Tasks.UnitTests", "src\Tasks\Microsoft.NET.Build.Extensions.Tasks.UnitTests\Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj", "{6ADADB58-92D3-438C-8D97-F495B59A83C0}"
@@ -200,10 +150,6 @@ Global
200150
EndGlobalSection
201151
GlobalSection(NestedProjects) = preSolution
202152
{1FEED16D-E07D-47C1-BB4C-56CD9F42B53B} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
203-
{09AD2F74-FAB2-40C8-B524-3319C3112690} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
204-
{7D6CD7B6-0237-40DD-9911-44FF22292131} = {09AD2F74-FAB2-40C8-B524-3319C3112690}
205-
{C6E91BB1-658C-4E10-9DBA-1C10B7558EFB} = {7D6CD7B6-0237-40DD-9911-44FF22292131}
206-
{B012211C-E8EB-4BA5-B100-D1EAB5ED316E} = {09AD2F74-FAB2-40C8-B524-3319C3112690}
207153
{61C31F8E-FE7C-47CC-B21C-3DEE499AD6F5} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
208154
{6ADADB58-92D3-438C-8D97-F495B59A83C0} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}
209155
{9CFC1EB5-8CF4-41D3-B91D-7D88B52F0B07} = {1FEED16D-E07D-47C1-BB4C-56CD9F42B53B}

‎src/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
1111

1212
<ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
13+
<LangVersion>Latest</LangVersion>
1314
</PropertyGroup>
1415

1516
<Import Project="Sdk.props" Sdk="RoslynTools.RepoToolset" />

‎src/Tasks/Common/ConflictResolution/ConflictResolver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ namespace Microsoft.NET.Build.Tasks.ConflictResolution
1616
internal class ConflictResolver<TConflictItem> : IDisposable where TConflictItem : class, IConflictItem
1717
{
1818
private Dictionary<string, TConflictItem> _winningItemsByKey = new Dictionary<string, TConflictItem>();
19-
private ILog _log;
19+
private Logger _log;
2020
private PackageRank _packageRank;
2121
private PackageOverrideResolver<TConflictItem> _packageOverrideResolver;
2222
private Dictionary<string, List<TConflictItem>> _unresolvedConflictItems = new Dictionary<string, List<TConflictItem>>(StringComparer.Ordinal);
2323

2424
// Callback for unresolved conflicts, currently just used as a test hook
2525
public Action<TConflictItem> UnresolvedConflictHandler { get; set; }
2626

27-
public ConflictResolver(PackageRank packageRank, PackageOverrideResolver<TConflictItem> packageOverrideResolver, ILog log)
27+
public ConflictResolver(PackageRank packageRank, PackageOverrideResolver<TConflictItem> packageOverrideResolver, Logger log)
2828
{
2929
this._log = log;
3030
this._packageRank = packageRank;

‎src/Tasks/Common/ConflictResolution/FrameworkListReader.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public FrameworkListReader(IBuildEngine4 buildEngine)
2323
_buildEngine = buildEngine;
2424
}
2525

26-
public IEnumerable<ConflictItem> GetConflictItems(string frameworkListPath, ILog log)
26+
public IEnumerable<ConflictItem> GetConflictItems(string frameworkListPath, Logger log)
2727
{
2828
if (frameworkListPath == null)
2929
{
@@ -60,7 +60,7 @@ public IEnumerable<ConflictItem> GetConflictItems(string frameworkListPath, ILog
6060
return result;
6161
}
6262

63-
private static IEnumerable<ConflictItem> LoadConflictItems(string frameworkListPath, ILog log)
63+
private static IEnumerable<ConflictItem> LoadConflictItems(string frameworkListPath, Logger log)
6464
{
6565
if (!File.Exists(frameworkListPath))
6666
{

‎src/Tasks/Common/ConflictResolution/PlatformManifestReader.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Microsoft.NET.Build.Tasks.ConflictResolution
1313
static class PlatformManifestReader
1414
{
1515
static readonly char[] s_manifestLineSeparator = new[] { '|' };
16-
public static IEnumerable<ConflictItem> LoadConflictItems(string manifestPath, ILog log)
16+
public static IEnumerable<ConflictItem> LoadConflictItems(string manifestPath, Logger log)
1717
{
1818
if (manifestPath == null)
1919
{

‎src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ResolvePackageFileConflicts : TaskBase
5454

5555
protected override void ExecuteCore()
5656
{
57-
var log = new MSBuildLog(Log);
57+
var log = Log;
5858
var packageRanks = new PackageRank(PreferredPackages);
5959
var packageOverrides = new PackageOverrideResolver<ConflictItem>(PackageOverrides);
6060

‎src/Tasks/Common/ILog.cs‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)