diff --git a/Directory.Build.targets b/Directory.Build.targets
index f16e04d9b4e..6b77ac258eb 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -20,4 +20,15 @@
     <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <GeneratedAssemblyInfoFile>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(MSBuildProjectName).AssemblyInfo$(DefaultLanguageSourceExtension)'))</GeneratedAssemblyInfoFile>
+  </PropertyGroup>
+
+  <!--
+    All source inputs to the compiler should be generated before BeforeCompile target. Sdk is not
+    honoring this for GenerateAssemblyInfo target. https://github.com/dotnet/sdk/issues/10614 
+  -->
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
 </Project>
diff --git a/eng/DisableSourceControlManagement.targets b/eng/DisableSourceControlManagement.targets
deleted file mode 100644
index 7e3ad57a9f0..00000000000
--- a/eng/DisableSourceControlManagement.targets
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
-  </PropertyGroup>
-
-  <!--
-    Override this target to disable calling the source control commands on some
-    platforms that don't support the targets like RHEL 6.
-  -->
-  <Target Name="InitializeSourceControlInformationFromSourceControlManager">
-    <PropertyGroup>
-      <SourceRevisionId>unknown</SourceRevisionId>
-    </PropertyGroup>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml
index 6663be37735..260931d01cb 100644
--- a/eng/pipelines/official/stages/publish.yml
+++ b/eng/pipelines/official/stages/publish.yml
@@ -29,7 +29,7 @@ stages:
     # Symbol validation is not ready yet. https://github.com/dotnet/arcade/issues/2871
     enableSymbolValidation: false
     # SourceLink validation doesn't work in dev builds: tries to pull from GitHub. https://github.com/dotnet/arcade/issues/3604
-    enableSourceLinkValidation: false
+    enableSourceLinkValidation: true
     # Allow symbol publish to emit expected warnings without failing the build. Include single
     # quotes inside the string so that it passes through to MSBuild without script interference.
     symbolPublishingAdditionalParameters: "'-warnAsError:$false'"
diff --git a/eng/versioning.targets b/eng/versioning.targets
index 25210133679..e089b0765b3 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -69,6 +69,7 @@
   <!-- Note: ReferenceAssemblies.targets still uses @(AssemblyInfoLines) as well. So if you remove this, those need to migrate too. -->
   <Target Name="_WriteNonStringAssemblyInfoAttributes"
           AfterTargets="CoreGenerateAssemblyInfo"
+          BeforeTargets="BeforeCompile;CoreCompile"
           Inputs="$(MSBuildProjectFile)"
           Outputs="$(AssemblyInfoFile)">
 
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index c60cf81af01..2d168eebe3a 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -104,12 +104,6 @@
     <StrongNameKeyId>SilverlightPlatform</StrongNameKeyId>
   </PropertyGroup>
 
-  <!-- SourceLink -->
-  <PropertyGroup>
-    <!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
   <!--
     Helper Paths
   -->
diff --git a/src/installer/Directory.Build.targets b/src/installer/Directory.Build.targets
index 687aebcad6b..52af95ef81d 100644
--- a/src/installer/Directory.Build.targets
+++ b/src/installer/Directory.Build.targets
@@ -9,8 +9,6 @@
 
   <Import Project="..\..\Directory.Build.targets" />
 
-  <Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
-
   <!-- Provide default targets which can be hooked onto or overridden as necessary -->
   <Target Name="Pack" />
 
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index f06a1c62867..e7d659d3141 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -355,7 +355,6 @@
 
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
     <!-- Workaround for https://github.com/microsoft/msbuild/issues/4474 -->
     <GenerateResourceUsePreserializedResources>false</GenerateResourceUsePreserializedResources>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 659009ab0db..7540e495515 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -146,8 +146,6 @@
   <!-- Import Packaging targets -->
   <Import Project="$(RepositoryEngineeringDir)packaging.targets" />
 
-  <Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
-
   <!-- Define this now until we can clean-up targets that depend on it in the packaging targets -->
   <Target Name="CreateVersionFileDuringBuild" />
 
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index b9cf138e934..a60befa49fa 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -108,12 +108,6 @@
     <StrongNameKeyId>SilverlightPlatform</StrongNameKeyId>
   </PropertyGroup>
 
-  <!-- SourceLink -->
-  <PropertyGroup>
-    <!-- This is needed to embed build-time generated sources such as eventing and resource files to sourcelink PDBs. -->
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
   <!--
     Helper Paths
   -->