diff options
| author | Katelyn Gadd <kg@luminance.org> | 2018-06-29 09:01:31 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2018-06-29 09:01:31 +0300 |
| commit | e271c293ee7a364a853a30f8574830ea84e0481a (patch) | |
| tree | 2cf0d6da865890a2498d6ebb3beebf3b91532041 /mcs/class/System.Json.Microsoft | |
| parent | 57b474ba90c4224c0ed0db618c2cf212cd1a0bf4 (diff) | |
Rework genproj to use gensources to build sources list for each profile and host platform (#8985)
* Update genproj makefile to include gensources
Update genproj argument parser to be more generous about displaying help
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint
* Fix rebase issue
* Checkpoint
* Checkpoint
* Fix built sources only being added to one profile
* Fix typo
* Checkpoint
* Fix indentation
* Use csc instead of mcs
* Checkpoint
* Fix BUILT_SOURCES only being handled for the first profile processed
* Checkpoint
* Checkpoint
* Strip double slashes from paths to fix spurious csproj change
* Checkpoint
* Checkpoint
* Checkpoint
* Checkpoint: Fix genproj compilation
* Checkpoint
* Checkpoint
* Checkpoint
* Fix crash when no targets were loaded (due to an error)
* Checkpoint
* Checkpoint
* Checkpoint
* Fix TryParseTargetInto bug
* Checkpoint
* Shuffle exclude logic around so that it works correctly during genproj diffing
* Remove gensources tracing
* Checkpoint
* Fix handling of oddball sources paths from executable.make
* Fix jay not being set to build
* Fix wrong slashes being used for embedded resource paths
* [csproj] Update project files
Diffstat (limited to 'mcs/class/System.Json.Microsoft')
| -rw-r--r-- | mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj index 81bb975bd59..ac4ee7f19ac 100644 --- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj +++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj @@ -44,8 +44,8 @@ <Optimize>true</Optimize>
</PropertyGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <!-- @COMMON_SOURCES@ -->
- <ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
+ <!-- @BUILT_SOURCES@ -->
+ <ItemGroup>
<Compile Include="..\..\..\external\aspnetwebstack\src\CommonAssemblyInfo.cs" />
<Compile Include="..\..\..\external\aspnetwebstack\src\RS.cs" />
<Compile Include="..\..\..\external\aspnetwebstack\src\TransparentCommonAssemblyInfo.cs" />
@@ -53,6 +53,7 @@ <Compile Include="Assembly\AssemblyInfo.cs" />
<Compile Include="System.Json\Extensions\JsonValueExtensions.cs" />
<Compile Include="System.Json\GlobalSuppressions.cs" />
+ <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />
<Compile Include="System.Json\JsonArray.cs" />
<Compile Include="System.Json\JsonObject.cs" />
<Compile Include="System.Json\JsonPrimitive.cs" />
@@ -62,11 +63,11 @@ <Compile Include="System.Json\JsonValueChangeEventArgs.cs" />
<Compile Include="System.Json\JsonValueDynamicMetaObject.cs" />
<Compile Include="System.Json\JsonValueLinqExtensions.cs" />
- <Compile Include="System.Json\JXmlToJsonValueConverter.cs" />
<Compile Include="System.Json\NGenWrapper.cs" />
<Compile Include="System.Json\Properties\AssemblyInfo.cs" />
<Compile Include="System.Json\Properties\Resources.Designer.cs" />
</ItemGroup>
+ <ItemGroup></ItemGroup>
<!-- @ALL_SOURCES@ -->
<!-- @COMMON_PROJECT_REFERENCES@ -->
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|