Skip to content

[main] Rebootstrap with latest changes #19145

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.

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 19 commits into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.2.24104.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
<!-- msbuild -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<!-- runtime -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"tools": {
"dotnet": "9.0.100-preview.2.24103.2"
"dotnet": "9.0.100-preview.4.24178.10"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2"
}
}
25 changes: 25 additions & 0 deletions src/SourceBuild/patches/arcade/0002-Disable-CA2022-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 16:33:22 +0000
Subject: [PATCH] Disable CA2022 error

Backport: https://github.com/dotnet/arcade/issues/14668
---
src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
index 764a87fa6..e20f70ff4 100644
--- a/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
+++ b/src/SignCheck/Microsoft.SignCheck/Verification/LZMAUtils.cs
@@ -30,8 +30,10 @@ public static void Decompress(string sourceFile, string destinationFile)
byte[] properties = new byte[5];
byte[] fileLengthBytes = new byte[8];

+#pragma warning disable CA2022 // Avoid inexact read
inFile.Read(properties, 0, 5);
inFile.Read(fileLengthBytes, 0, 8);
+#pragma warning restore CA2022

long fileLength = BitConverter.ToInt64(fileLengthBytes, 0);
decoder.SetDecoderProperties(properties);
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Sat, 30 Mar 2024 00:25:18 +0000
Subject: [PATCH] Disable CA2022 errors

Backport: https://github.com/NuGet/Home/issues/13361
---
.../Signing/Archive/SignedPackageArchiveUtility.cs | 2 ++
src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs | 2 ++
2 files changed, 4 insertions(+)

diff --git a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
index 44f3dbdc2..0d133441d 100644
--- a/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
+++ b/src/NuGet.Core/NuGet.Packaging/Signing/Archive/SignedPackageArchiveUtility.cs
@@ -104,7 +104,9 @@ public static Stream OpenPackageSignatureFileStream(BinaryReader reader)
var buffer = new byte[localFileHeader.UncompressedSize];

reader.BaseStream.Seek(offsetToData, SeekOrigin.Begin);
+#pragma warning disable CA2022 // Avoid inexact read
reader.BaseStream.Read(buffer, offset: 0, count: buffer.Length);
+#pragma warning restore CA2022

return new MemoryStream(buffer, writable: false);
}
diff --git a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
index e92a2dc0c..0fb6b35f4 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
+++ b/src/NuGet.Core/NuGet.ProjectModel/Utf8JsonStreamReader.cs
@@ -52,7 +52,9 @@ internal Utf8JsonStreamReader(Stream stream, int bufferSize = BufferSizeDefault,
_buffer = _bufferPool.Rent(bufferSize);
_disposed = false;
_stream = stream;
+#pragma warning disable CA2022 // Avoid inexact read
_stream.Read(_buffer, 0, 3);
+#pragma warning restore CA2022
if (!Utf8Bom.AsSpan().SequenceEqual(_buffer.AsSpan(0, 3)))
{
_bufferUsed = 3;
39 changes: 39 additions & 0 deletions src/SourceBuild/patches/sdk/0001-Disable-CA2022-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 19:48:28 +0000
Subject: [PATCH] Disable CA2022 errors

Backport: https://github.com/dotnet/sdk/issues/39893
---
src/RazorSdk/Tool/Client.cs | 2 ++
src/RazorSdk/Tool/ConnectionHost.cs | 2 ++
2 files changed, 4 insertions(+)

diff --git a/src/RazorSdk/Tool/Client.cs b/src/RazorSdk/Tool/Client.cs
index 3a0436aa8b..54c89bf8d6 100644
--- a/src/RazorSdk/Tool/Client.cs
+++ b/src/RazorSdk/Tool/Client.cs
@@ -169,7 +169,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation
try
{
ServerLogger.Log($"Before poking pipe {Identifier}.");
+#pragma warning disable CA2022 // Avoid inexact read
await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+#pragma warning restore CA2022
ServerLogger.Log($"After poking pipe {Identifier}.");
}
catch (OperationCanceledException)
diff --git a/src/RazorSdk/Tool/ConnectionHost.cs b/src/RazorSdk/Tool/ConnectionHost.cs
index d1c557dea9..f92397d6e9 100644
--- a/src/RazorSdk/Tool/ConnectionHost.cs
+++ b/src/RazorSdk/Tool/ConnectionHost.cs
@@ -107,7 +107,9 @@ public override async Task WaitForDisconnectAsync(CancellationToken cancellation
try
{
ServerLogger.Log($"Before poking pipe {Identifier}.");
+#pragma warning disable CA2022 // Avoid inexact read
await Stream.ReadAsync(Array.Empty<byte>(), 0, 0, cancellationToken);
+#pragma warning restore CA2022
ServerLogger.Log($"After poking pipe {Identifier}.");
}
catch (OperationCanceledException)
25 changes: 25 additions & 0 deletions src/SourceBuild/patches/vstest/0001-Disable-CA2022-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 18:27:34 +0000
Subject: [PATCH] Disable CA2022 errors

Backport: https://github.com/microsoft/vstest/issues/4955
---
.../Helpers/DotnetHostHelper.cs | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
index 519ee3441..3f8192014 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
@@ -409,8 +409,10 @@ public class DotnetHostHelper : IDotnetHostHelper
using var headerReader = _fileHelper.GetStream(path, FileMode.Open, FileAccess.Read);
var magicBytes = new byte[4];
var cpuInfoBytes = new byte[4];
+#pragma warning disable CA2022 // Avoid inexact read
headerReader.Read(magicBytes, 0, magicBytes.Length);
headerReader.Read(cpuInfoBytes, 0, cpuInfoBytes.Length);
+#pragma warning restore CA2022

var magic = BitConverter.ToUInt32(magicBytes, 0);
var cpuInfo = BitConverter.ToUInt32(cpuInfoBytes, 0);
24 changes: 24 additions & 0 deletions src/SourceBuild/patches/xdt/0001-Disable-CA2022-error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Fri, 29 Mar 2024 18:22:05 +0000
Subject: [PATCH] Disable CA2022 error

Backport: https://github.com/dotnet/xdt/issues/583
---
src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs | 2 ++
1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
index 5c884d7..1e86c48 100644
--- a/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
+++ b/src/Microsoft.Web.XmlTransform/XmlFileInfoDocument.cs
@@ -90,7 +90,9 @@ public class XmlFileInfoDocument : XmlDocument, IDisposable
Encoding encoding = null;
if (stream.CanSeek) {
byte[] buffer = new byte[3];
+#pragma warning disable CA2022 // Avoid inexact read
stream.Read(buffer, 0, buffer.Length);
+#pragma warning restore CA2022

if (buffer[0] == 0xEF && buffer[1] == 0xBB && buffer[2] == 0xBF)
encoding = Encoding.UTF8;