Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--external/dir.props2
-rw-r--r--external/runtime/Configurations.props3
-rw-r--r--external/runtime/runtime.depproj3
-rw-r--r--src/System.AppContext/src/Configurations.props3
-rw-r--r--src/System.Buffers/src/Configurations.props3
-rw-r--r--src/System.Diagnostics.Contracts/src/Configurations.props3
-rw-r--r--src/System.Diagnostics.Tools/src/Configurations.props3
-rw-r--r--src/System.Globalization.Calendars/src/Configurations.props3
-rw-r--r--src/System.Globalization/src/Configurations.props3
-rw-r--r--src/System.IO.UnmanagedMemoryStream/src/Configurations.props3
-rw-r--r--src/System.Reflection.Emit.ILGeneration/src/Configurations.props3
-rw-r--r--src/System.Reflection.Emit.Lightweight/src/Configurations.props3
-rw-r--r--src/System.Reflection.Emit/src/Configurations.props3
-rw-r--r--src/System.Reflection.Primitives/src/Configurations.props3
-rw-r--r--src/System.Reflection.TypeExtensions/src/Configurations.props3
-rw-r--r--src/System.Reflection/src/Configurations.props3
-rw-r--r--src/System.Resources.ResourceManager/src/Configurations.props3
-rw-r--r--src/System.Runtime.InteropServices/src/Configurations.props4
-rw-r--r--src/System.Runtime.Loader/src/Configurations.props3
-rw-r--r--src/System.Text.Encoding.Extensions/src/Configurations.props3
-rw-r--r--src/System.Text.Encoding/src/Configurations.props3
-rw-r--r--src/System.Threading.ThreadPool/src/Configurations.props3
-rw-r--r--src/System.Threading.Timer/src/Configurations.props3
23 files changed, 47 insertions, 22 deletions
diff --git a/external/dir.props b/external/dir.props
index 71a38f6da7..7381f12a00 100644
--- a/external/dir.props
+++ b/external/dir.props
@@ -1,7 +1,7 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\dir.props" />
<PropertyGroup>
- <IntermediateOutputPath>$(IntermediateOutputPath)$(ArchGroup)/</IntermediateOutputPath>
+ <IntermediateOutputPath>$(IntermediateOutputPath)$(OSGroup)-$(ArchGroup)/</IntermediateOutputPath>
<NugetRuntimeIdentifier>$(RuntimeOS)-$(ArchGroup)</NugetRuntimeIdentifier>
</PropertyGroup>
</Project>
diff --git a/external/runtime/Configurations.props b/external/runtime/Configurations.props
index 38f4dab7aa..6ea99618b9 100644
--- a/external/runtime/Configurations.props
+++ b/external/runtime/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap;
uapaot;
</BuildConfigurations>
diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj
index bad70c9c81..fd50c9cfe5 100644
--- a/external/runtime/runtime.depproj
+++ b/external/runtime/runtime.depproj
@@ -2,6 +2,9 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
+ <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
+ <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Windows_NT' AND '$(OSEnvironment)' != 'Windows_NT'">win7-x64</NugetRuntimeIdentifier>
+ <NugetRuntimeIdentifier Condition="'$(OSGroup)' == 'Unix' AND '$(OSEnvironment)' == 'Windows_NT'">ubuntu.14.04-x64</NugetRuntimeIdentifier>
<!-- WORKAROUND: Force external packages to be restored for x64 until arm packages are fully broughtup-->
<NugetRuntimeIdentifier Condition="'$(ArchGroup)' == 'arm'">$(RuntimeOS)-x64</NugetRuntimeIdentifier>
</PropertyGroup>
diff --git a/src/System.AppContext/src/Configurations.props b/src/System.AppContext/src/Configurations.props
index 674306c1dd..11b4c45db2 100644
--- a/src/System.AppContext/src/Configurations.props
+++ b/src/System.AppContext/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Buffers/src/Configurations.props b/src/System.Buffers/src/Configurations.props
index c3b1e70d7b..2f6cdc38e2 100644
--- a/src/System.Buffers/src/Configurations.props
+++ b/src/System.Buffers/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
netstandard1.1;
netstandard;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Diagnostics.Contracts/src/Configurations.props b/src/System.Diagnostics.Contracts/src/Configurations.props
index dcb70afd11..4c3df1a7d7 100644
--- a/src/System.Diagnostics.Contracts/src/Configurations.props
+++ b/src/System.Diagnostics.Contracts/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Diagnostics.Tools/src/Configurations.props b/src/System.Diagnostics.Tools/src/Configurations.props
index a8910ef718..bbb5be814e 100644
--- a/src/System.Diagnostics.Tools/src/Configurations.props
+++ b/src/System.Diagnostics.Tools/src/Configurations.props
@@ -3,7 +3,8 @@
<PropertyGroup>
<BuildConfigurations>
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Globalization.Calendars/src/Configurations.props b/src/System.Globalization.Calendars/src/Configurations.props
index a8910ef718..bbb5be814e 100644
--- a/src/System.Globalization.Calendars/src/Configurations.props
+++ b/src/System.Globalization.Calendars/src/Configurations.props
@@ -3,7 +3,8 @@
<PropertyGroup>
<BuildConfigurations>
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Globalization/src/Configurations.props b/src/System.Globalization/src/Configurations.props
index dcb70afd11..4c3df1a7d7 100644
--- a/src/System.Globalization/src/Configurations.props
+++ b/src/System.Globalization/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
index 475368bbbb..aed58fb42e 100644
--- a/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
+++ b/src/System.IO.UnmanagedMemoryStream/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uap-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Reflection.Emit.ILGeneration/src/Configurations.props b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
index 262829acbc..4e9b1a0bfd 100644
--- a/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
+++ b/src/System.Reflection.Emit.ILGeneration/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Reflection.Emit.Lightweight/src/Configurations.props b/src/System.Reflection.Emit.Lightweight/src/Configurations.props
index 262829acbc..4e9b1a0bfd 100644
--- a/src/System.Reflection.Emit.Lightweight/src/Configurations.props
+++ b/src/System.Reflection.Emit.Lightweight/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Reflection.Emit/src/Configurations.props b/src/System.Reflection.Emit/src/Configurations.props
index 262829acbc..4e9b1a0bfd 100644
--- a/src/System.Reflection.Emit/src/Configurations.props
+++ b/src/System.Reflection.Emit/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Reflection.Primitives/src/Configurations.props b/src/System.Reflection.Primitives/src/Configurations.props
index 2d2c47cf24..67525a6201 100644
--- a/src/System.Reflection.Primitives/src/Configurations.props
+++ b/src/System.Reflection.Primitives/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
netcoreapp1.2corert;
</BuildConfigurations>
</PropertyGroup>
diff --git a/src/System.Reflection.TypeExtensions/src/Configurations.props b/src/System.Reflection.TypeExtensions/src/Configurations.props
index 46ab240695..f9b8242235 100644
--- a/src/System.Reflection.TypeExtensions/src/Configurations.props
+++ b/src/System.Reflection.TypeExtensions/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
netfx-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
</BuildConfigurations>
</PropertyGroup>
diff --git a/src/System.Reflection/src/Configurations.props b/src/System.Reflection/src/Configurations.props
index dcb70afd11..4c3df1a7d7 100644
--- a/src/System.Reflection/src/Configurations.props
+++ b/src/System.Reflection/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Resources.ResourceManager/src/Configurations.props b/src/System.Resources.ResourceManager/src/Configurations.props
index dcb70afd11..4c3df1a7d7 100644
--- a/src/System.Resources.ResourceManager/src/Configurations.props
+++ b/src/System.Resources.ResourceManager/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Runtime.InteropServices/src/Configurations.props b/src/System.Runtime.InteropServices/src/Configurations.props
index 123771be84..4e63997461 100644
--- a/src/System.Runtime.InteropServices/src/Configurations.props
+++ b/src/System.Runtime.InteropServices/src/Configurations.props
@@ -3,7 +3,9 @@
<PropertyGroup>
<BuildConfigurations>
uapaot-Windows_NT;
- netcoreapp;
+ uap101aot-Windows_NT;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
netcoreapp1.2corert;
</BuildConfigurations>
diff --git a/src/System.Runtime.Loader/src/Configurations.props b/src/System.Runtime.Loader/src/Configurations.props
index 262829acbc..4e9b1a0bfd 100644
--- a/src/System.Runtime.Loader/src/Configurations.props
+++ b/src/System.Runtime.Loader/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
uap-Windows_NT;
uapaot-Windows_NT;
</BuildConfigurations>
diff --git a/src/System.Text.Encoding.Extensions/src/Configurations.props b/src/System.Text.Encoding.Extensions/src/Configurations.props
index a8910ef718..bbb5be814e 100644
--- a/src/System.Text.Encoding.Extensions/src/Configurations.props
+++ b/src/System.Text.Encoding.Extensions/src/Configurations.props
@@ -3,7 +3,8 @@
<PropertyGroup>
<BuildConfigurations>
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Text.Encoding/src/Configurations.props b/src/System.Text.Encoding/src/Configurations.props
index dcb70afd11..4c3df1a7d7 100644
--- a/src/System.Text.Encoding/src/Configurations.props
+++ b/src/System.Text.Encoding/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uapaot-Windows_NT;
uap-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Threading.ThreadPool/src/Configurations.props b/src/System.Threading.ThreadPool/src/Configurations.props
index 2845c11c54..1040c9ba37 100644
--- a/src/System.Threading.ThreadPool/src/Configurations.props
+++ b/src/System.Threading.ThreadPool/src/Configurations.props
@@ -2,7 +2,8 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Threading.Timer/src/Configurations.props b/src/System.Threading.Timer/src/Configurations.props
index 475368bbbb..aed58fb42e 100644
--- a/src/System.Threading.Timer/src/Configurations.props
+++ b/src/System.Threading.Timer/src/Configurations.props
@@ -4,7 +4,8 @@
<BuildConfigurations>
uap-Windows_NT;
uapaot-Windows_NT;
- netcoreapp;
+ netcoreapp-Windows_NT;
+ netcoreapp-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 13:43:05 +0300