diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e9ce3e57f4eab..02598cfc156643 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,84 +1,84 @@ - + https://github.com/dotnet/icu - e0f3966dad964863a9a9cdeed44dee147e412c21 + c54731505916e1f5a64f85b58f4109974702a147 https://github.com/dotnet/msquic dc012a715ceb9b5d5258f2fda77520586af5a36a - + https://github.com/dotnet/emsdk - 66b984594a008151bdb14dc60589373e3d44be83 + c91d3e0511d3888e5c6ddc096a224ec6c141beed https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 - + https://github.com/dotnet/llvm-project - 766e16bd0f277c527e6869c15b59c43d434c33d3 + 44c5d238f4bc553130a99681e14c4c345f966620 https://github.com/dotnet/command-line-api @@ -162,53 +162,53 @@ https://github.com/dotnet/arcade 2fe7be991697bae1101c72947fa0a5eaad4a6250 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 https://github.com/dotnet/llvm-project @@ -242,25 +242,25 @@ https://github.com/dotnet/llvm-project ec1fd7b45b2751ce9abf204b03871f471b903609 - + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 5da4a9e919dcee35f831ab69b6e475baaf798875 - + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 5da4a9e919dcee35f831ab69b6e475baaf798875 - + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 5da4a9e919dcee35f831ab69b6e475baaf798875 - + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 5da4a9e919dcee35f831ab69b6e475baaf798875 - + https://github.com/dotnet/runtime - a6f84d42529494b3539684ed993fa554281215b7 + 5da4a9e919dcee35f831ab69b6e475baaf798875 https://github.com/dotnet/linker @@ -302,29 +302,29 @@ https://github.com/dotnet/hotreload-utils bc294b0c516ea34765768c687794b307e2133a13 - + https://github.com/dotnet/runtime-assets - e564f14fdcd62653ca8ae8e7930500c6d2d111e5 + 0644c2f94de62bcf701135f2ef70b8ab1a3ac1e8 - + https://github.com/dotnet/roslyn - 08e08e755591b8efcbc95745835398e4965071fb + 00f49cc4587f982524e726a801e946ddf7cf42ed - + https://github.com/dotnet/roslyn - 08e08e755591b8efcbc95745835398e4965071fb + 00f49cc4587f982524e726a801e946ddf7cf42ed - + https://github.com/dotnet/roslyn - 08e08e755591b8efcbc95745835398e4965071fb + 00f49cc4587f982524e726a801e946ddf7cf42ed - + https://github.com/dotnet/roslyn-analyzers - 60f592cb113cb6930300ed49b762f9c1e7abb849 + 0b2bc22f087f4a42915a3f5d7049a0e71a179423 - + https://github.com/dotnet/roslyn-analyzers - 60f592cb113cb6930300ed49b762f9c1e7abb849 + 0b2bc22f087f4a42915a3f5d7049a0e71a179423 https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index aa2152390d097e..054758c685e95e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,17 +29,17 @@ - 3.3.4-beta1.23053.6 - 8.0.0-preview1.23053.6 + 3.3.4-beta1.23058.2 + 8.0.0-preview1.23058.2 - 4.6.0-1.23054.2 - 4.6.0-1.23054.2 - 4.6.0-1.23054.2 + 4.6.0-1.23058.1 + 4.6.0-1.23058.1 + 4.6.0-1.23058.1 6.0.0-preview.1.102 - 8.0.0-alpha.1.22631.1 + 8.0.0-alpha.1.23058.2 6.0.0 - 8.0.0-alpha.1.22631.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 + 8.0.0-alpha.1.23058.2 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 6.0.0 1.1.1 @@ -137,26 +137,26 @@ 5.0.0 7.0.0 4.9.0 - 8.0.0-alpha.1.22631.1 + 8.0.0-alpha.1.23058.2 6.0.0 7.0.0 4.5.4 4.5.0 - 8.0.0-alpha.1.22631.1 + 8.0.0-alpha.1.23058.2 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 - 7.0.0-beta.23054.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 + 8.0.0-beta.23059.1 1.0.0-prerelease.22511.6 1.0.0-prerelease.22511.6 @@ -217,7 +217,7 @@ 0.11.4-alpha.23053.1 0.11.4-alpha.23053.1 - 8.0.0-alpha.1.23052.1 + 8.0.0-alpha.1.23056.1 2.1.1 7.0.0-alpha.1.22406.1 @@ -231,20 +231,20 @@ 14.0.0-alpha.1.22626.2 14.0.0-alpha.1.22626.2 - 8.0.0-alpha.1.22620.1 + 8.0.0-alpha.1.23054.1 $(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 6.0.0-preview.5.21275.7 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 - 1.0.0-alpha.1.23052.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 + 1.0.0-alpha.1.23059.1 diff --git a/global.json b/global.json index 40ef8ec6f7dd7c..001a3535aa2783 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23053.5", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22631.1" + "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.23058.2" } } diff --git a/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs b/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs index 5685f3cfd713e9..43ad68864dfac1 100644 --- a/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs +++ b/src/tools/illink/src/ILLink.Tasks/CreateRuntimeRootDescriptorFile.cs @@ -68,7 +68,7 @@ readonly struct FeatureSwitchMembers public string FeatureValue { get; } public string FeatureDefault { get; } // Unique value to track the key - private readonly String _key; + private readonly string _key; public FeatureSwitchMembers (string feature, string featureValue, string featureDefault) { @@ -302,7 +302,7 @@ void OutputXml (string iLLinkTrimXmlFilePath, string outputFileName) { XmlDocument doc = new XmlDocument (); doc.Load (iLLinkTrimXmlFilePath); - XmlNode linkerNode = doc["linker"]; + XmlElement linkerNode = doc["linker"]; if (featureSwitchMembers.Count > 0) { foreach ((var fs, var members) in featureSwitchMembers.Select (kv => (kv.Key, kv.Value))) { @@ -344,7 +344,7 @@ void OutputXml (string iLLinkTrimXmlFilePath, string outputFileName) static void AddXmlTypeNode (XmlDocument doc, XmlNode assemblyNode, string typeName, ClassMembers members) { - XmlNode typeNode = doc.CreateElement ("type"); + XmlElement typeNode = doc.CreateElement ("type"); XmlAttribute typeFullName = doc.CreateAttribute ("fullname"); typeFullName.Value = typeName; typeNode.Attributes.Append (typeFullName); diff --git a/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs b/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs index 9fef9b59cdeb81..3daeb136f11df6 100644 --- a/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs +++ b/src/tools/illink/src/linker/Linker/LinkerAttributesInformation.cs @@ -106,7 +106,7 @@ public IEnumerable GetAttributes () where T : Attribute return attributeList.Cast (); } - static Attribute? ProcessRequiresUnreferencedCodeAttribute (LinkContext context, ICustomAttributeProvider provider, CustomAttribute customAttribute) + static RequiresUnreferencedCodeAttribute? ProcessRequiresUnreferencedCodeAttribute (LinkContext context, ICustomAttributeProvider provider, CustomAttribute customAttribute) { if (!(provider is MethodDefinition || provider is TypeDefinition)) return null;