Skip to content

Commit 6dcbf9f

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/dotnet (#491)
* [VMR] Codeflow 6eacb34-6eacb34 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 269082 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25267.102 -> 10.0.0-beta.25269.109) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent d956f00 commit 6dcbf9f

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

‎eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-externals" Sha="d60c3fe894af16cd15dc86420af0fc9d02be4997" BarId="268973" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-externals" Sha="a4d6fdc935d5da12efb00a0b3b693ff1439e0b41" BarId="269082" />
44
<ToolsetDependencies>
55
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-24619-01">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
77
<Sha>e9b99f554a3c298e1106ea171f5a0462780af2c5</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25269.109">
9+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25270.108">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>d60c3fe894af16cd15dc86420af0fc9d02be4997</Sha>
11+
<Sha>a4d6fdc935d5da12efb00a0b3b693ff1439e0b41</Sha>
1212
</Dependency>
1313
</ToolsetDependencies>
1414
</Dependencies>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.5.25265.106"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25269.109",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25270.108",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

‎src/repos/projects/Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44

55
<PropertyGroup>
66
<TargetFramework>$(NetCurrent)</TargetFramework>
7-
<RepositoryName>$(MSBuildProjectName)</RepositoryName>
7+
<InnerRepoName>$(MSBuildProjectName)</InnerRepoName>
88

99
<SrcReposDir>$(SrcDir)repos/</SrcReposDir>
1010
<KeysDir>$(SrcReposDir)keys/</KeysDir>
1111
<SubmoduleDirectory>$(SrcReposDir)src/</SubmoduleDirectory>
1212
<PatchesDir>$(SrcReposDir)patches/</PatchesDir>
13-
<OriginalProjectDirectory>$([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(RepositoryName)'))</OriginalProjectDirectory>
13+
<OriginalProjectDirectory>$([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(InnerRepoName)'))</OriginalProjectDirectory>
1414
<ProjectDirectory>$([MSBuild]::NormalizeDirectory('$(OriginalProjectDirectory)', 'artifacts', 'clone'))</ProjectDirectory>
15-
<ArtifactsLogRepoDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(RepositoryName)'))</ArtifactsLogRepoDir>
15+
<ArtifactsLogRepoDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(InnerRepoName)'))</ArtifactsLogRepoDir>
1616

1717
<MinimalConsoleLogOutput Condition="'$(MinimalConsoleLogOutput)' == ''">true</MinimalConsoleLogOutput>
18-
<RepoConsoleLogFile>$(ArtifactsLogRepoDir)$(RepositoryName).log</RepoConsoleLogFile>
18+
<RepoConsoleLogFile>$(ArtifactsLogRepoDir)$(InnerRepoName).log</RepoConsoleLogFile>
1919
<RedirectRepoOutputToLog Condition="'$(MinimalConsoleLogOutput)' == 'true'">&gt; $(RepoConsoleLogFile) 2&gt;&amp;1</RedirectRepoOutputToLog>
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PatchToApply Include="$(PatchesDir)$(RepositoryName)/*.patch" />
23+
<PatchToApply Include="$(PatchesDir)$(InnerRepoName)/*.patch" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/repos/projects/Directory.Build.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<Target Name="BuildRepoReferences" Condition="'@(RepositoryReference)' != '' and '$(SkipRepoReferences)' != 'true'">
13-
<Message Importance="High" Text="Building dependencies [@(RepositoryReference)] needed by '$(RepositoryName)'." />
13+
<Message Importance="High" Text="Building dependencies [@(RepositoryReference)] needed by '$(InnerRepoName)'." />
1414

1515
<ItemGroup>
1616
<_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" />
@@ -81,7 +81,7 @@
8181

8282
<ItemGroup>
8383
<_DependentProjectSources Include="@(RepositoryReference -> '%(Identity).proj')">
84-
<RepositoryName>%(Identity)</RepositoryName>
84+
<InnerRepoName>%(Identity)</InnerRepoName>
8585
</_DependentProjectSources>
8686
</ItemGroup>
8787

@@ -104,7 +104,7 @@
104104
<WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" />
105105

106106
<AddSourceToNuGetConfig NuGetConfigFile="$(NewNuGetConfigFile)"
107-
SourceName="%(_DependencyProjectsPackagesOutput.RepositoryName)"
107+
SourceName="%(_DependencyProjectsPackagesOutput.InnerRepoName)"
108108
SourcePath="%(_DependencyProjectsPackagesOutput.Identity)" />
109109
</Target>
110110

@@ -156,7 +156,7 @@
156156
<EnvironmentVariables Condition="'$(NUGET_PACKAGES)' != ''" Include="NUGET_PACKAGES=$(NUGET_PACKAGES)" />
157157
</ItemGroup>
158158

159-
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building '$(RepositoryName)'" />
159+
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building '$(InnerRepoName)'" />
160160
<Message Importance="High" Text="Running command:" />
161161
<Message Importance="High" Text=" $(BuildCommand)" Condition="'$(BuildCommand)' != ''" />
162162
<Message Importance="High" Text=" Using custom build target" Condition="'$(BuildCommand)' == ''" />
@@ -172,7 +172,7 @@
172172

173173
<CallTarget Targets="CustomRepoBuild" Condition="'$(CustomRepoBuild)' == 'true'" />
174174

175-
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building '$(RepositoryName)'...done" />
175+
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Building '$(InnerRepoName)'...done" />
176176

177177
<MakeDir Directories="$(BaseIntermediateOutputPath)" />
178178
<Touch Files="$(BaseIntermediateOutputPath)RepoBuild.complete" AlwaysCreate="true">
@@ -184,7 +184,7 @@
184184

185185
<Target Name="ReportRepoError">
186186
<Message Importance="High" Text="$([System.IO.File]::ReadAllText('$(RepoConsoleLogFile)'))" Condition="Exists('$(RepoConsoleLogFile)')" />
187-
<Message Importance="High" Text="'$(RepositoryName)' failed during build." />
187+
<Message Importance="High" Text="'$(InnerRepoName)' failed during build." />
188188
<Message Importance="High" Text="See '$(RepoConsoleLogFile)' for more information." Condition="Exists('$(RepoConsoleLogFile)')" />
189189
</Target>
190190

‎src/repos/projects/netcorecli-fsc.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<OutputArgs>/bl:$(ArtifactsLogRepoDir)build.binlog</OutputArgs>
55
<OutputArgs>$(OutputArgs) /v:$(LogVerbosity)</OutputArgs>
6-
<OutputArgs>$(OutputArgs) /p:OutputPath=$(OutputPath)$(RepositoryName)/</OutputArgs>
7-
<OutputArgs>$(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(RepositoryName)</OutputArgs>
6+
<OutputArgs>$(OutputArgs) /p:OutputPath=$(OutputPath)$(InnerRepoName)/</OutputArgs>
7+
<OutputArgs>$(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(InnerRepoName)</OutputArgs>
88
<OutputArgs>$(OutputArgs) $(RedirectRepoOutputToLog)</OutputArgs>
99

1010
<BuildCommandArgs>pack</BuildCommandArgs>

0 commit comments

Comments
 (0)