Skip to content

Commit 69e114c

Browse files
trylektrylek
authored
December infra rollout - remove duplicated 'src' from coreclr subrepo (src/coreclr/src becomes src/coreclr) (#44973)
* Move src/coreclr/src/Directory.Build.targets to src/coreclr Merge src/coreclr/src/CMakeLists.txt into src/coreclr/CMakeLists.txt * Mechanical move of src/coreclr/src to src/coreclr * Scripts adjustments to reflect the changed paths
1 parent 0ec0794 commit 69e114c

File tree

5,169 files changed

+207
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,169 files changed

+207
-216
lines changed

‎.gitignore‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ dlldata.c
8484
*.svclog
8585
*.scc
8686

87+
# Special file
88+
!src/coreclr/.nuget/_.pdb
89+
8790
# Chutzpah Test files
8891
_Chutzpah*
8992

@@ -133,9 +136,6 @@ AutoTest.Net/
133136
# Web workbench (sass)
134137
.sass-cache/
135138

136-
# BenchmarkDotNet
137-
BenchmarkDotNet.Artifacts/
138-
139139
# Installshield output folder
140140
[Ee]xpress/
141141

@@ -295,10 +295,10 @@ prime/
295295
stage/
296296

297297
# CLR prebuilt generated files
298-
!src/pal/prebuilt/idl/*_i.c
298+
!pal/prebuilt/idl/*_i.c
299299

300300
# Valid 'debug' folder, that contains CLR debugging code
301-
!src/debug
301+
!debug
302302

303303
# Ignore folders created by the CLR test build
304304
TestWrappers_x64_[d|D]ebug
@@ -313,7 +313,6 @@ TestWrappers_arm_[r|R]elease
313313
TestWrappers_arm64_[d|D]ebug
314314
TestWrappers_arm64_[c|C]hecked
315315
TestWrappers_arm64_[r|R]elease
316-
tests/src/common/test_runtime/project.json
317316

318317
Vagrantfile
319318
.vagrant
@@ -333,7 +332,7 @@ cross/android-rootfs/*
333332
*.pyc
334333

335334
# JIT32 files
336-
src/jit32
335+
jit32
337336

338337
# performance testing sandbox
339338
sandbox
@@ -344,17 +343,23 @@ linker
344343
# Symbolic link for the shared portion of CoreLib to make grep/findstr work for runtime devs
345344
#
346345
# On Windows, make your own by running these commands from the repo root:
347-
# mklink /D src\coreclr\src\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
348-
# mklink /D src\coreclr\src\System.Private.CoreLib\common %CD%\src\libraries\Common\src
346+
# mklink /D src\coreclr\System.Private.CoreLib\shared %CD%\src\libraries\System.Private.CoreLib\src
347+
# mklink /D src\coreclr\System.Private.CoreLib\common %CD%\src\libraries\Common\src
349348
#
350349
# On Unix, make your own by running these commands from the repo root:
351-
# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/src/System.Private.CoreLib/shared
352-
# ln -s $(pwd)/src/libraries/Common/src src/coreclr/src/System.Private.CoreLib/common
353-
src/coreclr/src/System.Private.CoreLib/shared
354-
src/coreclr/src/System.Private.CoreLib/common
350+
# ln -s $(pwd)/src/libraries/System.Private.CoreLib/src src/coreclr/System.Private.CoreLib/shared
351+
# ln -s $(pwd)/src/libraries/Common/src src/coreclr/System.Private.CoreLib/common
352+
src/coreclr/System.Private.CoreLib/shared
353+
src/coreclr/System.Private.CoreLib/common
355354

356355
# The debug directory should not be ignored
357-
!src/coreclr/src/debug
356+
!src/coreclr/debug
357+
358+
# Exceptions to the exclusions
359+
!src/coreclr/.nuget/_.pdb
360+
!src/coreclr/inc/obj/
361+
!src/coreclr/vm/.vscode/
362+
!src/coreclr/vm/.vscode/c_cpp_properties.json
358363

359364
# Mono Wasm-specific excludes
360365
src/mono/wasm/emsdk/

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<!-- System.Private.CoreLib -->
4949
<CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
50-
<CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'src', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
50+
<CoreLibProject Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$([MSBuild]::NormalizePath('$(CoreClrProjectRoot)', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
5151
<CoreLibProject Condition="'$(RuntimeFlavor)' == 'Mono'">$([MSBuild]::NormalizePath('$(MonoProjectRoot)', 'netcore', 'System.Private.CoreLib', 'System.Private.CoreLib.csproj'))</CoreLibProject>
5252
</PropertyGroup>
5353

‎eng/Subsets.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@
136136

137137
<!-- CoreClr sets -->
138138
<ItemGroup Condition="$(_subset.Contains('+clr.corelib+'))">
139-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\System.Private.CoreLib\System.Private.CoreLib.csproj" Category="clr" />
139+
<ProjectToBuild Include="$(CoreClrProjectRoot)System.Private.CoreLib\System.Private.CoreLib.csproj" Category="clr" />
140140
</ItemGroup>
141141

142142
<ItemGroup Condition="'$(TargetOS)' == 'windows' and ($(_subset.Contains('+clr.dactools+')) or $(_subset.Contains('+clr.runtime+')))">
143-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\ToolBox\SOS\DacTableGen\DacTableGen.csproj;
144-
$(CoreClrProjectRoot)src\ToolBox\SOS\DIALib\DIALib.ilproj"
143+
<ProjectToBuild Include="$(CoreClrProjectRoot)ToolBox\SOS\DacTableGen\DacTableGen.csproj;
144+
$(CoreClrProjectRoot)ToolBox\SOS\DIALib\DIALib.ilproj"
145145
Category="clr"/>
146146
</ItemGroup>
147147

@@ -166,7 +166,7 @@
166166
</ItemGroup>
167167

168168
<ItemGroup Condition="$(_subset.Contains('+clr.paltestlist+'))">
169-
<ProjectToBuild Include="$(CoreClrProjectRoot)src/pal/tests/palsuite/producepaltestlist.proj" />
169+
<ProjectToBuild Include="$(CoreClrProjectRoot)pal/tests/palsuite/producepaltestlist.proj" />
170170
</ItemGroup>
171171

172172
<ItemGroup Condition="$(_subset.Contains('+linuxdac+')) and $([MSBuild]::IsOsPlatform(Windows)) and '$(TargetArchitecture)' != 'x86'">
@@ -178,17 +178,17 @@
178178
</ItemGroup>
179179

180180
<ItemGroup Condition="$(_subset.Contains('+crossdacpack+'))">
181-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\.nuget\Microsoft.CrossOsDiag.Private.CoreCLR\Microsoft.CrossOsDiag.Private.CoreCLR.proj" Category="clr" />
181+
<ProjectToBuild Include="$(CoreClrProjectRoot).nuget\Microsoft.CrossOsDiag.Private.CoreCLR\Microsoft.CrossOsDiag.Private.CoreCLR.proj" Category="clr" />
182182
</ItemGroup>
183183

184184
<ItemGroup Condition="$(_subset.Contains('+clr.tools+'))">
185-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\runincontext\runincontext.csproj;
186-
$(CoreClrProjectRoot)src\tools\r2rdump\R2RDump.csproj;
187-
$(CoreClrProjectRoot)src\tools\dotnet-pgo\dotnet-pgo.csproj;
188-
$(CoreClrProjectRoot)src\tools\r2rtest\R2RTest.csproj;
189-
$(CoreClrProjectRoot)src\tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
185+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\runincontext\runincontext.csproj;
186+
$(CoreClrProjectRoot)tools\r2rdump\R2RDump.csproj;
187+
$(CoreClrProjectRoot)tools\dotnet-pgo\dotnet-pgo.csproj;
188+
$(CoreClrProjectRoot)tools\r2rtest\R2RTest.csproj;
189+
$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Category="clr" />
190190

191-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj"
191+
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler.TypeSystem.ReadyToRun.Tests\ILCompiler.TypeSystem.ReadyToRun.Tests.csproj"
192192
Test="true" Category="clr" Condition="'$(__DistroRid)' != 'linux-musl-x64'"/>
193193
</ItemGroup>
194194

@@ -197,7 +197,7 @@
197197
</ItemGroup>
198198

199199
<ItemGroup Condition="$(_subset.Contains('+clr.packages+'))">
200-
<ProjectToBuild Include="$(CoreClrProjectRoot)src\.nuget\coreclr-packages.proj" Pack="true" Category="clr" />
200+
<ProjectToBuild Include="$(CoreClrProjectRoot).nuget\coreclr-packages.proj" Pack="true" Category="clr" />
201201
</ItemGroup>
202202

203203
<!-- Mono sets -->

src/coreclr/src/.nuget/Directory.Build.props renamed to src/coreclr/.nuget/Directory.Build.props

File renamed without changes.

src/coreclr/src/.nuget/Directory.Build.targets renamed to src/coreclr/.nuget/Directory.Build.targets

File renamed without changes.

src/coreclr/src/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.pkgproj renamed to src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.pkgproj

File renamed without changes.

src/coreclr/src/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj renamed to src/coreclr/.nuget/Microsoft.CrossOsDiag.Private.CoreCLR/Microsoft.CrossOsDiag.Private.CoreCLR.proj

File renamed without changes.

src/coreclr/src/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj renamed to src/coreclr/.nuget/Microsoft.ILVerification/Microsoft.ILVerification.pkgproj

File renamed without changes.

src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj renamed to src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj

File renamed without changes.

src/coreclr/src/.nuget/Microsoft.NET.Sdk.IL/sdk/Sdk.props renamed to src/coreclr/.nuget/Microsoft.NET.Sdk.IL/sdk/Sdk.props

File renamed without changes.

0 commit comments

Comments
 (0)