Skip to content

Commit 217ab30

Browse files
am11danmoseley
authored andcommitted
Cleanup some instances of project.json from the repo (dotnet#12484)
* Replace ScriptGenerator project.json with csproj * Update project.json occurrences in docs Fix few typos. * Remove project.json comments
1 parent 68673ed commit 217ab30

File tree

113 files changed

+24
-455
lines changed

Some content is hidden

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

113 files changed

+24
-455
lines changed

Documentation/building/windows-test-instructions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ Note:
9898

9999
1. You can disable building of a test per architecture or configuration by using DisableProjectBuild tag in the project. for example:
100100

101-
``<PropertyGroup>``
101+
```xml
102+
<PropertyGroup>
103+
<DisableProjectBuild Condition=" '$(Platform)' == 'arm64' ">true</DisableProjectBuild>
104+
</PropertyGroup>
105+
```
102106

103-
``<DisableProjectBuild Condition=" '$(Platform)' == 'arm64' ">true</DisableProjectBuild>``
107+
2. To add Nuget/MyGet references use this (project file)[https://github.com/dotnet/coreclr/blob/master/tests/src/Common/test_dependencies/test_dependencies.csproj].
104108

105-
``</PropertyGroup>``
106-
107-
2. To Add Nuget\MyGet Refernces use this (project.json)[https://github.com/dotnet/coreclr/blob/master/tests/src/Common/test_dependencies/project.json]
108-
109-
3. To Build against the mscorlib facade add ``<ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>`` to your project
109+
3. To build against the mscorlib facade add `<ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>` to your project.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ you use `dotnet.exe` for this).
9090

9191
These extra pieces are not defined here, however you don't need to build them in order to use the CoreCLR
9292
Nuget package you create here. There are already versions of the CoreFX packages published on
93-
https://www.nuget.org/ so you can have your test application's project.json specify the CoreCLR you
93+
https://www.nuget.org/ so you can have your test application's project file specify the CoreCLR you
9494
built and it will naturally pull anything else it needs from the official location https://www.nuget.org/ to
9595
make a complete application. More on this in the [Using Your Build](Documentation/workflow/UsingYourBuild.md) page.
9696

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<AssemblyName>ScriptGenerator</AssemblyName>
7+
<PackageId>ScriptGenerator</PackageId>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="xunit.core" Version="2.3.0-beta3-build3705" />
12+
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
13+
</ItemGroup>
14+
15+
</Project>
-1.08 KB
Binary file not shown.

tests/scripts/optdata/bootstrap.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def get_buildos():
3939
return 'OSX' if sysname.lower() == 'Darwin'.lower() else sysname
4040

4141
def get_optdata_version(tool):
42-
"""Returns the version string specified in project.json for the given tool."""
42+
"""Returns the version string specified in project file for the given tool."""
4343
element_name = {
4444
'IBC': 'IbcDataPackageVersion',
4545
'PGO': 'PgoDataPackageVersion',

tests/scripts/project.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

tests/src/JIT/Regression/JitBlue/CoreFX_15913/CoreFX_15913.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ItemGroup>
2929
<Compile Include="CoreFX_15913.cs" />
3030
</ItemGroup>
31-
<!-- <PropertyGroup>
32-
<ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
33-
<ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
34-
</PropertyGroup>-->
3531
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3632
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
3733
</Project>

tests/src/JIT/Regression/JitBlue/GitHub_11508/GitHub_11508.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ItemGroup>
2929
<Compile Include="GitHub_11508.cs" />
3030
</ItemGroup>
31-
<!-- <PropertyGroup>
32-
<ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
33-
<ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
34-
</PropertyGroup>-->
3531
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3632
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
3733
</Project>

tests/src/JIT/Regression/JitBlue/GitHub_11574/GitHub_11574.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ItemGroup>
2929
<Compile Include="GitHub_11574.cs" />
3030
</ItemGroup>
31-
<!-- <PropertyGroup>
32-
<ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
33-
<ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
34-
</PropertyGroup>-->
3531
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3632
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
3733
</Project>

tests/src/JIT/SIMD/AbsGeneric_r.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@
2828
<ItemGroup>
2929
<Compile Include="AbsGeneric.cs" />
3030
</ItemGroup>
31-
<!-- <PropertyGroup>
32-
<ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
33-
<ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
34-
</PropertyGroup>-->
3531
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3632
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup>
3733
</Project>

0 commit comments

Comments
 (0)