Skip to content

Clean-up VMR repo projects #48436

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.

Sign up for GitHub

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 16 commits into from
Apr 18, 2025
Merged

Clean-up VMR repo projects #48436

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c507adf
Clean-up VMR repo projects
ViktorHofer Apr 14, 2025
46ea906
Use standard -verbosity CLI format
ViktorHofer Apr 14, 2025
fe3cbe3
Add msbuild patch to resolve warnings
ViktorHofer Apr 14, 2025
6da42ad
Update msbuild patch
ViktorHofer Apr 14, 2025
4710dca
try to fix patch
ViktorHofer Apr 14, 2025
4ec1343
fiiix patch
ViktorHofer Apr 14, 2025
0ec4c3e
fix patch??
ViktorHofer Apr 14, 2025
a9274db
Delete src/SourceBuild/patches/msbuild/0001-fix-warnings.patch
ViktorHofer Apr 16, 2025
8238da6
Merge branch 'main' into SimplifyVMRProjs
ViktorHofer Apr 16, 2025
1da4775
Revert the PublishWindowsPdb change in two projects
ViktorHofer Apr 17, 2025
e61e106
Fine tunings
ViktorHofer Apr 18, 2025
0cba842
Merge branch 'main' into SimplifyVMRProjs
ViktorHofer Apr 18, 2025
08e6cbc
Use short verbosity form
ViktorHofer Apr 18, 2025
385fb57
Fiiixes
ViktorHofer Apr 18, 2025
7478dd4
aspnetcore is not nice to me
ViktorHofer Apr 18, 2025
64a7a3e
Merge branch 'main' into SimplifyVMRProjs
ViktorHofer Apr 18, 2025
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
2 changes: 1 addition & 1 deletion src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@

<PropertyGroup>
<FullCommand>$(BuildCommand)</FullCommand>
<FullCommand Condition="'$(LogVerbosityOptOut)' != 'true'">$(FullCommand) /v:$(LogVerbosity)</FullCommand>
<FullCommand Condition="'$(LogVerbosityOptOut)' != 'true'">$(FullCommand) -v $(LogVerbosity)</FullCommand>
<FullCommand Condition="'$(MinimalConsoleLogOutput)' == 'true'">$(FullCommand) &gt; $(RepoConsoleLogFile) 2&gt;&amp;1</FullCommand>
</PropertyGroup>

Expand Down
4 changes: 0 additions & 4 deletions src/SourceBuild/content/repo-projects/arcade.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<RepositoryReference Include="source-build-reference-packages" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
</ItemGroup>

<ItemGroup>
<ExtraPackageVersionPropsPackageInfo Include="NuGetVersion" Version="%24(NuGetPackagingVersion)" />
</ItemGroup>

<ItemGroup>
<BuiltSdkPackage Include="Microsoft.DotNet.Arcade.Sdk" />
<BuiltSdkPackage Include="Microsoft.DotNet.SharedFramework.Sdk" />
Expand Down
2 changes: 0 additions & 2 deletions src/SourceBuild/content/repo-projects/aspnetcore.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
<!-- PackageValidation fails with desktop msbuild: https://github.com/dotnet/sdk/issues/45004. -->
<BuildArgs>$(BuildArgs) /p:EnablePackageValidation=false</BuildArgs>

<LogVerbosityOptOut>true</LogVerbosityOptOut>

<!-- Tests are failing to build: https://github.com/dotnet/aspnetcore/issues/60095 -->
<DotNetBuildTestsOptOut>true</DotNetBuildTestsOptOut>
</PropertyGroup>
Expand Down
6 changes: 0 additions & 6 deletions src/SourceBuild/content/repo-projects/command-line-api.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/SourceBuild/content/repo-projects/deployment-tools.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@
<RepositoryReference Include="source-build-reference-packages" />
</ItemGroup>

<ItemGroup>
<!-- https://github.com/dotnet/source-build/issues/4115. -->
<EnvironmentVariables Include="PublishWindowsPdb=false" />
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions src/SourceBuild/content/repo-projects/fsharp.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<!-- Use the repo root build script -->
<BuildScript>$(ProjectDirectory)build$(ShellExtension)</BuildScript>

Expand Down
5 changes: 1 addition & 4 deletions src/SourceBuild/content/repo-projects/msbuild.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
<!-- The toolset compiler doesn't get killed with 'build-server shutdown'.
Instead of disabling shared compilation, disable the toolset compiler package. -->
<BuildArgs>$(BuildArgs) /p:UsingToolMicrosoftNetCompilers=false</BuildArgs>
Expand Down
5 changes: 2 additions & 3 deletions src/SourceBuild/content/repo-projects/roslyn-analyzers.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
<!-- When building source only, dependencies get updated which trigger new nullability warnings. -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we have a tracking issue for that? since eventually we'll see it in the VMR build too

Copy link
Member Author

@ViktorHofer ViktorHofer Apr 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The remaining roslyn-analyzers component (NetAnalyzers) will be moved into sdk soon (ETA: May-June). The warnings will then show up as part of the move and naturally resolved.

<BuildArgs Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions src/SourceBuild/content/repo-projects/roslyn.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<!-- Use the repo root build script -->
<BuildScript>$(ProjectDirectory)build$(ShellExtension)</BuildScript>

Expand All @@ -13,7 +11,6 @@
<BuildActions Condition="'$(BuildOS)' == 'windows' and '$(Sign)' == 'true'">$(BuildActions) $(FlagParameterPrefix)sign</BuildActions>

<BuildArgs>$(BuildArgs) /p:TreatWarningsAsErrors=false</BuildArgs>
<BuildArgs>$(BuildArgs) /p:PublishWindowsPdb=false</BuildArgs>
</PropertyGroup>

<PropertyGroup Condition="'$(BuildOS)' == 'windows' and '$(OfficialBuildId)' != ''">
Expand Down
2 changes: 0 additions & 2 deletions src/SourceBuild/content/repo-projects/runtime.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<!-- Use the repo root build script -->
<BuildScript>$(ProjectDirectory)build$(ShellExtension)</BuildScript>

Expand Down
14 changes: 0 additions & 14 deletions src/SourceBuild/content/repo-projects/sdk.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<!-- Tests are only building on Windows - https://github.com/dotnet/source-build/issues/4882 -->
<DotNetBuildTestsOptOut Condition="'$(OS)' != 'Windows_NT'">true</DotNetBuildTestsOptOut>

<BuildArgs>$(BuildArgs) /p:PortableRid=$(PortableRid)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>

<!--
Setting NETCoreAppMaximumVersion to a high version so that the sdk doesn't complain if we're restoring/publishing for a higher version than the sdk.
See https://github.com/dotnet/sdk/issues/1512#issuecomment-377082883
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we no longer need this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will rev to the next major version differently with the VMR for .NET 11. At that point I expect that we will globally flow a set of properties in to the inner repos which will allow to target the next major version. The property is currently not needed as maximum version is 10.

-->
<BuildArgs>$(BuildArgs) /p:NETCoreAppMaximumVersion=99.9</BuildArgs>

<!-- We need to extract the non-portable OS name from the non-portable RID and pass that to installer build script.
This should not happen except when building non-portable. installer generally extracts the OSName from the host OS,
Expand Down Expand Up @@ -74,11 +65,6 @@
<KeepFeedPrefixes Include="darc-int-dotnet-aspnetcore-" />
</ItemGroup>

<ItemGroup>
<!-- https://github.com/dotnet/source-build/issues/4115. -->
<EnvironmentVariables Include="PublishWindowsPdb=false" />
</ItemGroup>

<ItemGroup>
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion" Version="%24(MicrosoftWindowsDesktopAppRefPackageVersion)" />
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostwinx64PackageVersion" Version="%24(MicrosoftNETCoreAppRefPackageVersion)" />
Expand Down
4 changes: 0 additions & 4 deletions src/SourceBuild/content/repo-projects/sourcelink.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
<RepositoryReference Include="command-line-api" />
Expand Down
7 changes: 0 additions & 7 deletions src/SourceBuild/content/repo-projects/templating.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
</ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions src/SourceBuild/content/repo-projects/windowsdesktop.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
<RepositoryReference Include="wpf" />
Expand Down
3 changes: 0 additions & 3 deletions src/SourceBuild/content/repo-projects/winforms.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)NativeToolsOnMachine</BuildArgs>
</PropertyGroup>

Expand Down
3 changes: 0 additions & 3 deletions src/SourceBuild/content/repo-projects/wpf.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<ForceDotNetMSBuildEngine>false</ForceDotNetMSBuildEngine>

<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildArgs>
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildArgs>
<!-- TODO setting Platform shouldn't be necesary: https://github.com/dotnet/source-build/issues/4314 -->
<BuildArgs>$(BuildArgs) /p:Platform=$(TargetArchitecture)</BuildArgs>
<BuildArgs>$(BuildArgs) /p:BuildWithNetFrameworkHostedCompiler=true</BuildArgs>
Expand Down
4 changes: 0 additions & 4 deletions src/SourceBuild/content/repo-projects/xdt.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<PropertyGroup>
<LogVerbosityOptOut>true</LogVerbosityOptOut>
</PropertyGroup>

<ItemGroup>
<RepositoryReference Include="arcade" />
</ItemGroup>
Expand Down
Loading