Skip to content
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

[main] Update dependencies from dotnet/scenario-tests #45028

Merged
merged 2 commits into from
Nov 22, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Nov 21, 2024

This pull request updates the following dependencies

From https://github.com/dotnet/scenario-tests

  • Subscription: 57ea1d23-e7d2-46b3-3894-08dc657823f1
  • Build: 20241122.1
  • Date Produced: November 22, 2024 11:49:59 AM UTC
  • Commit: 2acfac2e45092b884281b76fb6fc33fadb1cba58
  • Branch: refs/heads/main

…ld 20241121.2

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 10.0.0-preview.24568.2 -> To Version 10.0.0-preview.24571.2
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-CodeFlow untriaged Request triage from a team member labels Nov 21, 2024
@ViktorHofer
Copy link
Member

@premun can you please take a look at the patch sync failures here?

@premun
Copy link
Member

premun commented Nov 22, 2024

@ViktorHofer only fails on Unix, maybe CLRF again in patches?

@ViktorHofer
Copy link
Member

ViktorHofer commented Nov 22, 2024

We don't have a patch for this repo... We only have a single patch which shouldn't fail here: https://github.com/dotnet/sdk/tree/main/src/SourceBuild

@premun
Copy link
Member

premun commented Nov 22, 2024

@ViktorHofer something is off with latest change the scenario-tests repo - I just pulled changes from main and I see changes in the same files as those that are conflicting:

D:\repos\scenario-tests> git diff -R
diff --git b/eng/Signing.props a/eng/Signing.props
index 341e4c5..6aceb74 100644
--- b/eng/Signing.props
+++ a/eng/Signing.props
@@ -1,9 +1,9 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- This file is also imported in Publish.proj, so condition on the Sign project. -->
-    <EnableDefaultArtifacts Condition="'$(MSBuildProjectName)' == 'Sign'">false</EnableDefaultArtifacts>
-    <AllowEmptySignList>true</AllowEmptySignList>
-  </PropertyGroup>
-
+<Project>^M
+^M
+  <PropertyGroup>^M
+    <!-- This file is also imported in Publish.proj, so condition on the Sign project. -->^M
+    <EnableDefaultArtifacts Condition="'$(MSBuildProjectName)' == 'Sign'">false</EnableDefaultArtifacts>^M
+    <AllowEmptySignList>true</AllowEmptySignList>^M
+  </PropertyGroup>^M
+^M
 </Project>
\ No newline at end of file
diff --git b/src/Directory.Packages.props a/src/Directory.Packages.props
index 74e63b4..b55bc4f 100644
--- b/src/Directory.Packages.props
+++ a/src/Directory.Packages.props

Something is wrong with EOLs there

…ld 20241122.1

Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests
 From Version 10.0.0-preview.24568.2 -> To Version 10.0.0-preview.24572.1
@dotnet-maestro dotnet-maestro bot merged commit 4d69d22 into main Nov 22, 2024
42 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-main-ab72718e-aeb3-4642-a9f5-453cb872b413 branch November 22, 2024 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-CodeFlow untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants