Skip to content

Verify source diffs between VMR and input repos #5201

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

Open
mmitche opened this issue May 16, 2025 · 3 comments
Open

Verify source diffs between VMR and input repos #5201

mmitche opened this issue May 16, 2025 · 3 comments
Assignees

Comments

@mmitche
Copy link
Member

mmitche commented May 16, 2025

As preview5 winds down and starts to go out the door, I would like to verify that after many iterations of flow between the repos and the VMR, that we have not started to get "permanent" diffs.,

Verify that the actual source diffs between repos and the VMR is as expected.

@mmitche
Copy link
Member Author

mmitche commented May 16, 2025

@premun @dkurepa

@mmitche
Copy link
Member Author

mmitche commented May 16, 2025

I was seeing unexpected diffs from darc vmr diff between diagnostics main and VMR main.

diff --git a/src/shared/debug/inc/dbgutil.h b/src/shared/debug/inc/dbgutil.h
deleted file mode 100644
index ed34de6..0000000
--- a/src/shared/debug/inc/dbgutil.h

However, these files do both exist, so maybe just an issue with the tool.

@premun
Copy link
Member

premun commented May 20, 2025

I tried manually overriding VMR's content with diagnostics' and got only this small diff:

 src/diagnostics/.github/CODEOWNERS    | 1 +
 src/diagnostics/Directory.Build.props | 7 +++----
 src/diagnostics/eng/Build.props       | 1 -
 src/diagnostics/eng/DotNetBuild.props | 9 +++++++++
 4 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 src/diagnostics/eng/DotNetBuild.props

diff --git a/src/diagnostics/.github/CODEOWNERS b/src/diagnostics/.github/CODEOWNERS
index b638e2c5753..a2a328030cb 100644
--- a/src/diagnostics/.github/CODEOWNERS
+++ b/src/diagnostics/.github/CODEOWNERS
@@ -7,3 +7,4 @@
 # have proper ownership.
 /src/                       @dotnet/dotnet-diag
 /documentation/             @dotnet/dotnet-diag
+/eng/DotNetBuild.props      @dotnet/product-construction
diff --git a/src/diagnostics/Directory.Build.props b/src/diagnostics/Directory.Build.props
index 57094776fdd..42e40c8907f 100644
--- a/src/diagnostics/Directory.Build.props
+++ b/src/diagnostics/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <ContinuousIntegrationBuild Condition="'$(OfficialBuildId)' != ''">true</ContinuousIntegrationBuild>
-    <PublishWindowsPdb>false</PublishWindowsPdb>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,11 +22,11 @@
 
   <PropertyGroup>
     <DesktopTargetFramework>net462</DesktopTargetFramework>
-    <!--
-        This represents the minimum supported .NET Version, so the min version that the tools must
+    <!-- 
+        This represents the minimum supported .NET Version, so the min version that the tools must 
         be able to run against for a simple customer experience.
 
-        When bumping this, bump __targetRid in build.sh/build-native.cmd and modify the
+        When bumping this, bump __targetRid in build.sh/build-native.cmd and modify the 
         Debugger.Tests.Configs to reflect the new TFMs
      -->
     <NetCoreAppMinVersion>8.0</NetCoreAppMinVersion>
diff --git a/src/diagnostics/eng/Build.props b/src/diagnostics/eng/Build.props
index 61f52242a2f..9e4698ebbb8 100644
--- a/src/diagnostics/eng/Build.props
+++ b/src/diagnostics/eng/Build.props
@@ -1,6 +1,5 @@
 <Project>
 
-  <!-- Only build the NETCore.Client library in .NET product build mode. -->
   <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
     <ProjectToBuild Include="$(RepoRoot)src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj" />
   </ItemGroup>
diff --git a/src/diagnostics/eng/DotNetBuild.props b/src/diagnostics/eng/DotNetBuild.props
new file mode 100644
index 00000000000..2577f816601
--- /dev/null
+++ b/src/diagnostics/eng/DotNetBuild.props
@@ -0,0 +1,9 @@
+<!-- When altering this file, include @dotnet/product-construction as a reviewer. -->
+<Project>
+
+  <PropertyGroup>
+    <GitHubRepositoryName>diagnostics</GitHubRepositoryName>
+    <SourceBuildManagedOnly>true</SourceBuildManagedOnly>
+  </PropertyGroup>
+
+</Project>
-- 
2.49.0.windows.1

So it seems like the tool is doing something wrong. I have not used it myself really but maybe it's comparing wrong commits or something.

@mmitche mmitche self-assigned this May 20, 2025
@mmitche mmitche moved this from Ready to Blocked in .NET Unified Build May 20, 2025
premun added a commit to premun/arcade-services that referenced this issue May 23, 2025
premun added a commit to dotnet/arcade-services that referenced this issue May 23, 2025
Adds a new option that only lists the differing file names

dotnet/source-build#5201
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Backlog
Status: Blocked
Development

No branches or pull requests

3 participants