diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8b66ff75d47809..b9d47f7aab95a1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24277.1", + "version": "9.0.0-prerelease.24311.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 877692d81ce72d..a6b7658319cd5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 17806e105a2086c25ae5bdf3401cb09867734480 + b7fb07bc07a95b5ef13df8c2b6210649b3238ef9 https://github.com/dotnet/msquic @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade 7507f80c8db285bbc9939c1dff522a761cf4edc0 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 https://github.com/dotnet/llvm-project @@ -282,55 +282,55 @@ https://github.com/dotnet/llvm-project 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/runtime - 35e4aad602ee3c28330e94746cfd4e0d4569b66f + 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 975b330d51119efc4884f7a323784662cbf74391 - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 975b330d51119efc4884f7a323784662cbf74391 - + https://github.com/dotnet/xharness - 914dd73b3622741590db173b5dd6eac1aa9cc553 + 975b330d51119efc4884f7a323784662cbf74391 https://github.com/dotnet/arcade @@ -352,13 +352,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization c3acfd159662959ff09f3a0d7663023db48bb78a - + https://github.com/dotnet/hotreload-utils - 1d072e52c0a376670f0bbf1a12a1b3da3e62bfd0 + 68c6c65054f2720f503402903a82eefd5e1ccfda - + https://github.com/dotnet/runtime-assets - 8c8e6ecef4ffb2a8db22ca249e6b6eea2cf3bca9 + 40711d8fe9f9971dada6d9f8388f19978bb14223 https://github.com/dotnet/roslyn @@ -386,14 +386,14 @@ 37b70f27ecf6578ad0b74d04406036b03ab90c8f - + https://github.com/dotnet/sdk - 29b15d1fca51ca7f1d4db87c2b15e39dcaf7bb53 + 651839198c00b7c7b95db37dbb9268b66691fad0 - + https://github.com/dotnet/sdk - 29b15d1fca51ca7f1d4db87c2b15e39dcaf7bb53 + 651839198c00b7c7b95db37dbb9268b66691fad0 diff --git a/eng/Versions.props b/eng/Versions.props index 0c7b9b3e0ba1b9..bd9117c5c4c111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ 0.2.0 - 9.0.100-preview.6.24277.1 + 9.0.100-preview.6.24311.23 9.0.0-beta.24306.4 9.0.0-beta.24306.4 @@ -104,10 +104,10 @@ 6.0.0-preview.1.102 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 6.0.0 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 6.0.0 1.1.1 @@ -119,39 +119,39 @@ 8.0.0 5.0.0 4.5.5 - 9.0.0-preview.5.24275.1 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24307.2 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 6.0.0 7.0.0 4.5.4 4.5.0 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 8.0.0 8.0.0 8.0.0 8.0.0 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 - 9.0.0-beta.24277.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 + 9.0.0-beta.24312.1 1.0.0-prerelease.24223.3 1.0.0-prerelease.24223.3 @@ -179,10 +179,10 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.24277.1 - 9.0.0-prerelease.24277.1 - 9.0.0-prerelease.24277.1 - 9.0.0-alpha.0.24277.1 + 9.0.0-prerelease.24311.2 + 9.0.0-prerelease.24311.2 + 9.0.0-prerelease.24311.2 + 9.0.0-alpha.0.24303.1 3.12.0 4.5.0 6.0.0 @@ -210,9 +210,9 @@ 0.11.4-alpha.24230.1 - 9.0.0-preview.5.24275.1 + 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24277.1 + 9.0.0-preview.6.24303.1 2.3.5 9.0.0-alpha.1.24167.3 diff --git a/global.json b/global.json index b42548f05e6d3c..c4299459befdf5 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24306.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "9.0.0-preview.5.24275.1" + "Microsoft.NET.Sdk.IL": "9.0.0-preview.6.24307.2" } } diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresAssemblyFilesAnalyzerTests.cs b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresAssemblyFilesAnalyzerTests.cs index ae1206588b0f88..751f5f441d95ec 100644 --- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresAssemblyFilesAnalyzerTests.cs +++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/RequiresAssemblyFilesAnalyzerTests.cs @@ -182,16 +182,16 @@ public Task CallDangerousMethodInsideProperty () class C { - bool field; + bool @field; [RequiresAssemblyFiles] bool P { get { - return field; + return @field; } set { CallDangerousMethod (); - field = value; + @field = value; } }