diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a9f856732b..acc7102ad4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,14 +1,14 @@
-
+
https://github.com/dotnet/msbuild
e9b99f554a3c298e1106ea171f5a0462780af2c5
-
+
https://github.com/dotnet/dotnet
- d60c3fe894af16cd15dc86420af0fc9d02be4997
+ a4d6fdc935d5da12efb00a0b3b693ff1439e0b41
diff --git a/global.json b/global.json
index b3e6f52002..9c3d677079 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,7 @@
"dotnet": "10.0.100-preview.5.25265.106"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25269.109",
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25270.108",
"Microsoft.Build.NoTargets": "3.7.0"
}
}
diff --git a/src/repos/projects/Directory.Build.props b/src/repos/projects/Directory.Build.props
index e68c5ac21a..9434f95140 100644
--- a/src/repos/projects/Directory.Build.props
+++ b/src/repos/projects/Directory.Build.props
@@ -4,23 +4,23 @@
$(NetCurrent)
- $(MSBuildProjectName)
+ $(MSBuildProjectName)
$(SrcDir)repos/
$(SrcReposDir)keys/
$(SrcReposDir)src/
$(SrcReposDir)patches/
- $([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(RepositoryName)'))
+ $([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(InnerRepoName)'))
$([MSBuild]::NormalizeDirectory('$(OriginalProjectDirectory)', 'artifacts', 'clone'))
- $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(RepositoryName)'))
+ $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(InnerRepoName)'))
true
- $(ArtifactsLogRepoDir)$(RepositoryName).log
+ $(ArtifactsLogRepoDir)$(InnerRepoName).log
> $(RepoConsoleLogFile) 2>&1
-
+
diff --git a/src/repos/projects/Directory.Build.targets b/src/repos/projects/Directory.Build.targets
index 5b374f4fc4..5541b586cb 100644
--- a/src/repos/projects/Directory.Build.targets
+++ b/src/repos/projects/Directory.Build.targets
@@ -10,7 +10,7 @@
-
+
<_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" />
@@ -81,7 +81,7 @@
<_DependentProjectSources Include="@(RepositoryReference -> '%(Identity).proj')">
- %(Identity)
+ %(Identity)
@@ -104,7 +104,7 @@
@@ -156,7 +156,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -184,7 +184,7 @@
-
+
diff --git a/src/repos/projects/netcorecli-fsc.proj b/src/repos/projects/netcorecli-fsc.proj
index edcfbd0f65..4e2685dc2a 100644
--- a/src/repos/projects/netcorecli-fsc.proj
+++ b/src/repos/projects/netcorecli-fsc.proj
@@ -3,8 +3,8 @@
/bl:$(ArtifactsLogRepoDir)build.binlog
$(OutputArgs) /v:$(LogVerbosity)
- $(OutputArgs) /p:OutputPath=$(OutputPath)$(RepositoryName)/
- $(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(RepositoryName)
+ $(OutputArgs) /p:OutputPath=$(OutputPath)$(InnerRepoName)/
+ $(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(InnerRepoName)
$(OutputArgs) $(RedirectRepoOutputToLog)
pack