Skip to content

Bump to .NET 6.0.100-preview.3.21161.23 #10772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Mar 24, 2021
Merged

Bump to .NET 6.0.100-preview.3.21161.23 #10772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea84d9d
Bump to .NET 6.0.100-preview.3.21152.10
rolfbjarne Feb 26, 2021
423712f
Merge remote-tracking branch 'origin/main' into dotnet-bump-6.0.100-p…
rolfbjarne Mar 5, 2021
50a9ba3
Bump to 6.0.100-preview.3.21152.10.
rolfbjarne Mar 5, 2021
66a6671
Bump to 6.0.100-preview.3.21161.7.
rolfbjarne Mar 11, 2021
c0e5f8f
Merge remote-tracking branch 'origin/main' into dotnet-bump-6.0.100-p…
rolfbjarne Mar 11, 2021
09fface
Merge remote-tracking branch 'origin/main' into dotnet-bump-6.0.100-p…
rolfbjarne Mar 15, 2021
d601990
Bump to .NET 6.0.100-preview.3.21161.23.
rolfbjarne Mar 15, 2021
9e86b7a
[dotnet-linker] Bump ILink and use the supported method of getting an…
rolfbjarne Mar 16, 2021
ca5147d
Merge remote-tracking branch 'origin/main' into dotnet-bump-6.0.100-p…
rolfbjarne Mar 22, 2021
857a96b
Bump to MSBuild.StructuredLogger 2.1.364 to get support for newer bin…
rolfbjarne Mar 22, 2021
a788e61
Fix build failure
rolfbjarne Mar 23, 2021
c40253f
Merge remote-tracking branch 'origin/main' into dotnet-bump-6.0.100-p…
rolfbjarne Mar 23, 2021
335bb66
Update parsing binlog properties.
rolfbjarne Mar 23, 2021
d08d175
Be more defensive.
rolfbjarne Mar 23, 2021
fa9e6a6
[tests] Make sure the InternalsVisibleToAttribute constructor isn't l…
rolfbjarne Mar 23, 2021
50afe74
[tests] Implement better printing of binlogs.
rolfbjarne Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Make.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,11 @@ DOTNET_FEED_DIR ?= $(DOTNET_DESTDIR)/nuget-feed

BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION:=$(shell if test -f $(TOP)/builds/BundledNETCorePlatformsPackageVersion.txt; then cat $(TOP)/builds/BundledNETCorePlatformsPackageVersion.txt; else echo "run-make-in-builds-directory-first"; fi)

DOTNET6_VERSION=6.0.100-preview.2.21155.3
DOTNET6_VERSION=6.0.100-preview.3.21161.23
DOTNET6_VERSION_BAND=$(firstword $(subst -, ,$(DOTNET6_VERSION)))
DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21155.3/dotnet-sdk-6.0.100-preview.2.21155.3-osx-x64.pkg
DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.2.21155.3/dotnet-sdk-6.0.100-preview.2.21155.3-osx-x64.tar.gz
DOTNET6_URL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.3.21161.23/dotnet-sdk-6.0.100-preview.3.21161.23-osx-x64.pkg
DOTNET6_TARBALL=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/6.0.100-preview.3.21161.23/dotnet-sdk-6.0.100-preview.3.21161.23-osx-x64.tar.gz

DOTNET6_TARBALL_NAME=$(notdir $(DOTNET6_TARBALL))
DOTNET6_DIR=$(abspath $(TOP)/builds/downloads/$(basename $(basename $(DOTNET6_TARBALL_NAME))))
DOTNET6=$(DOTNET6_DIR)/dotnet
Expand Down
2 changes: 1 addition & 1 deletion tests/bgen/bgen-tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.303" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>

<ItemGroup>
Expand Down
42 changes: 40 additions & 2 deletions tests/common/BinLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,49 @@ public static IEnumerable<string> PrintToLines (string path)
if (args is ProjectStartedEventArgs psea) {
if (psea.Properties != null) {
yield return "Initial Properties";
foreach (var prop in psea.Properties.Cast<System.Collections.DictionaryEntry> ().OrderBy (v => v.Key))
yield return $"{prop.Key} = {prop.Value}";
var dict = psea.Properties as IDictionary<string, string>;
if (dict == null) {
yield return $"Unknown property dictionary type: {psea.Properties.GetType ().FullName}";
} else {
foreach (var prop in dict.OrderBy (v => v.Key))
yield return $"{prop.Key} = {prop.Value}";
}
}
}

if (args is TaskParameterEventArgs tpea) {
switch (tpea.Kind) {
case TaskParameterMessageKind.AddItem:
yield return "Added Item(s)";
break;
case TaskParameterMessageKind.RemoveItem:
yield return "Removed Item(s)";
break;
case TaskParameterMessageKind.TaskInput:
yield return "Task Parameter";
break;
case TaskParameterMessageKind.TaskOutput:
yield return "Output Item(s)";
break;
default:
yield return $"Unknown Kind ({tpea.Kind})";
break;
}
foreach (var item in tpea.Items) {
var taskItem = item as ITaskItem;
yield return $"\t{tpea.ItemType}=";
if (taskItem != null) {
yield return $"\t\t{taskItem.ItemSpec}";
foreach (var metadataName in taskItem.MetadataNames) {
yield return $"\t\t\t{metadataName}={taskItem.GetMetadata (metadataName?.ToString ())}";
}
} else {
yield return $"\t{item}";
}
}
continue;
}

foreach (var line in args.Message.Split (eols, System.StringSplitOptions.RemoveEmptyEntries))
yield return line;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/dotnet/UnitTests/DotNetUnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.2" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.303" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/generator/generator-tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.303" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>
<ItemGroup>
<Compile Include="ErrorTests.cs" />
Expand Down
12 changes: 12 additions & 0 deletions tests/linker/ios/link all/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,16 @@ static void Main (string[] args)
}
#endif // !__WATCHOS__
}

#if NET
// https://github.com/mono/linker/issues/1913
[Foundation.Preserve (AllMembers = true)]
class Preserver
{
public Preserver ()
{
GC.KeepAlive (new System.Runtime.CompilerServices.InternalsVisibleToAttribute ("preserve this constructor"));
}
}
#endif
}
4 changes: 1 addition & 3 deletions tests/mmptest/mmptest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
<HintPath>..\..\_mac-build\Library\Frameworks\Xamarin.Mac.framework\Versions\git\lib\mmp\mmp.exe</HintPath>
</Reference>
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger">
<Version>2.1.176</Version>
</PackageReference>
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
Expand Down
4 changes: 2 additions & 2 deletions tests/msbuild/Xamarin.MacDev.Tests/TestHelpers/BuildEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ public void ParseBinLog (string log)
} else if (args is ProjectEvaluationStartedEventArgs projectEvaluationStarted) {
if (verbose)
Console.WriteLine ($"ProjectEvaluationStarted: {projectEvaluationStarted.ProjectFile}");
} else if (args is ProjectEvaluationFinishedEventArgs projectEvaluationFinished) {
} else if (args.GetType ().Name == "ProjectEvaluationFinishedEventArgs") {
if (verbose)
Console.WriteLine ($"ProjectEvaluationFinished: {projectEvaluationFinished.ProjectFile}");
Console.WriteLine ($"ProjectEvaluationFinished: {args}");
} else if (args is ProjectStartedEventArgs projectStarted) {
if (verbose)
Console.WriteLine ($"ProjectStarted: {projectStarted.ProjectFile}");
Expand Down
2 changes: 1 addition & 1 deletion tests/msbuild/Xamarin.MacDev.Tests/Xamarin.MacDev.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="NUnit.Extension.NUnitV2ResultWriter" Version="3.6.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.303" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\mtouch\Cache.cs">
Expand Down
2 changes: 1 addition & 1 deletion tests/mtouch/mtouch.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit.ConsoleRunner" Version="3.11.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.1" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.303" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.364" />
</ItemGroup>
<ItemGroup>
<Compile Include="MTouch.cs" />
Expand Down
6 changes: 1 addition & 5 deletions tools/dotnet-linker/LinkerConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,7 @@ public void Write ()

public string GetAssemblyFileName (AssemblyDefinition assembly)
{
// See: https://github.com/mono/linker/issues/1313
// Call LinkContext.Resolver.GetAssemblyFileName (https://github.com/mono/linker/blob/da2cc0fcd6c3a8e8e5d1b5d4a655f3653baa8980/src/linker/Linker/AssemblyResolver.cs#L88) using reflection.
var resolver = typeof (LinkContext).GetProperty ("Resolver").GetValue (Context);
var filename = (string) resolver.GetType ().GetMethod ("GetAssemblyFileName", new Type [] { typeof (AssemblyDefinition) }).Invoke (resolver, new object [] { assembly });
return filename;
return Context.GetAssemblyLocation (assembly);
}

public void WriteOutputForMSBuild (string itemName, List<MSBuildItem> items)
Expand Down
2 changes: 1 addition & 1 deletion tools/dotnet-linker/dotnet-linker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="XliffTasks" Version="1.0.0-beta.20154.1" />
<PackageReference Include="Microsoft.NET.ILLink" Version="6.0.0-alpha.1.21065.1" />
<PackageReference Include="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21166.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\common\ApplePlatform.cs">
Expand Down