diff --git a/docs/coding-guidelines/updating-ref-source.md b/docs/coding-guidelines/updating-ref-source.md
index d702db01f695fa..b6bcd1ed686fae 100644
--- a/docs/coding-guidelines/updating-ref-source.md
+++ b/docs/coding-guidelines/updating-ref-source.md
@@ -3,15 +3,15 @@ This document provides the steps you need to take to update the reference assemb
## For most assemblies within libraries
1. Implement the API in the source assembly and [build it](../workflow/building/libraries/README.md#building-individual-libraries).
-2. Run the following command (from the src directory) `msbuild /t:GenerateReferenceSource` to update the reference assembly**.
+2. Run the following command (from the src directory) `msbuild /t:GenerateReferenceAssemblySource` to update the reference assembly**.
3. Navigate to the ref directory and build the reference assembly.
4. Add, build, and run tests.
-** **Note:** If you already added the new API to the reference source, re-generating it (after building the source assembly) will update it to be fully qualified and placed in the correct order. This can be done by running the `GenerateReferenceSource` command from the ref directory.
+** **Note:** If you already added the new API to the reference source, re-generating it (after building the source assembly) will update it to be fully qualified and placed in the correct order. This can be done by running the `GenerateReferenceAssemblySource` command from the ref directory.
## For System.Runtime
These steps can also be applied to some unique assemblies which depend on changes in System.Private.Corelib. (partial facades like System.Memory, for example).
-1) Run `dotnet build -c Release /t:GenerateReferenceSource` from the System.Runtime/ref directory.
+1) Run `dotnet build -c Release /t:GenerateReferenceAssemblySource` from the System.Runtime/ref directory.
2) Filter out all unrelated changes and extract the changes you care about (ignore certain attributes being removed). Generally, this step is not required for other reference assemblies.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e19c6206fc00fb..fd83c8e3f7a596 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -18,9 +18,9 @@
https://github.com/dotnet/arcade
8547938aefa24475a04877285553f0b2663ae249
-
+
https://github.com/dotnet/arcade
- 8547938aefa24475a04877285553f0b2663ae249
+ 8078d8f3f77b7e8b7f6e289cf82cfdfa9c7a9355
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index 258b54f2c7570d..6317305f3a4b61 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,7 +60,7 @@
5.0.0-beta.20256.5
5.0.0-beta.20256.5
5.0.0-beta.20256.5
- 5.0.0-beta.20256.5
+ 5.0.0-beta.20258.8
5.0.0-beta.20256.5
5.0.0-beta.20256.5
2.5.1-beta.20256.5
diff --git a/eng/outerBuild.targets b/eng/outerBuild.targets
index dd546d6bd6f6bc..2c529a56aa2f91 100644
--- a/eng/outerBuild.targets
+++ b/eng/outerBuild.targets
@@ -1,7 +1,7 @@
-
+
diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets
index 00d7d54abb80b8..34d0eb49199c8c 100644
--- a/eng/referenceFromRuntime.targets
+++ b/eng/referenceFromRuntime.targets
@@ -111,7 +111,7 @@
-
+
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index d03b42639c2e6d..0efc8a53b0aca2 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -154,27 +154,23 @@
-
+
- <_RefSourceFileOutputPath>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', '$(AssemblyName).cs'))
<_ExcludeAPIList>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', 'ReferenceSourceExcludeApi.txt'))
<_ExcludeAttributesList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt
- <_LicenseHeaderTxtPath>$(RepositoryEngineeringDir)LicenseHeader.txt
-
-
-
- <_GenAPICmd>$(_GenAPICommand)
- <_GenAPICmd>$(_GenAPICmd) "@(IntermediateAssembly)"
- <_GenAPICmd>$(_GenAPICmd) --lib-path "$(RefPath.Trim('\/'))"
- <_GenAPICmd>$(_GenAPICmd) --out "$(_RefSourceFileOutputPath)"
- <_GenAPICmd>$(_GenAPICmd) --exclude-attributes-list "$(_ExcludeAttributesList)"
- <_GenAPICmd Condition="Exists('$(_ExcludeAPIList)')">$(_GenAPICmd) --exclude-api-list "$(_ExcludeAPIList)"
- <_GenAPICmd>$(_GenAPICmd) --header-file "$(_LicenseHeaderTxtPath)"
- <_GenAPICmd Condition="'$(LangVersion)' != ''">$(_GenAPICmd) --lang-version "$(LangVersion)"
+ <_LicenseHeaderTxtPath>$(RepositoryEngineeringDir)LicenseHeader.txt
+ $([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', '$(AssemblyName).cs'))
+ $(GenAPIAdditionalParameters) --exclude-attributes-list "$(_ExcludeAttributesList)"
+ $(GenAPIAdditionalParameters) --exclude-api-list "$(_ExcludeAPIList)"
+ $(GenAPIAdditionalParameters) --header-file "$(_LicenseHeaderTxtPath)"
+ $(GenAPIAdditionalParameters) --lang-version "$(LangVersion)"
+ $(GenAPIAdditionalParameters) --follow-type-forwards
+
-
-
+
+