projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6f26005)
[release/3.1] Update dependencies from dotnet/corefx (#26508)
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Wed, 11 Sep 2019 01:13:29 +0000 (01:13 +0000)
committerGitHub <noreply@github.com>
Wed, 11 Sep 2019 01:13:29 +0000 (01:13 +0000)
* Update dependencies from https://github.com/dotnet/corefx build 20190903.6

- Microsoft.NETCore.Platforms - 3.0.0-rc1.19453.6
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-rc1.19453.6

* Update dependencies from https://github.com/dotnet/corefx build 20190904.8

- Microsoft.NETCore.Platforms - 3.0.0-rc1.19454.8
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-rc1.19454.8

* Update dependencies from https://github.com/dotnet/corefx build 20190906.2

- Microsoft.NETCore.Platforms - 3.1.0-preview1.19456.2
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-preview1.19456.2

* changing the target framework for tests to 3.1

* Update dependencies from https://github.com/dotnet/corefx build 20190906.20

- Microsoft.NETCore.Platforms - 3.1.0-preview1.19456.20
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-preview1.19456.20

* Update dependencies from https://github.com/dotnet/corefx build 20190907.5

- Microsoft.NETCore.Platforms - 3.1.0-preview1.19457.5
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-preview1.19457.5

* Update dependencies from https://github.com/dotnet/corefx build 20190909.13

- Microsoft.NETCore.Platforms - 3.1.0-preview1.19459.13
- Microsoft.Private.CoreFx.NETCoreApp - 4.7.0-preview1.19459.13

* 3.0 -> 3.1

eng/Version.Details.xml patch | blob | history
eng/Versions.props patch | blob | history
tests/publishdependency.targets patch | blob | history
tests/src/Common/CoreFX/CoreFX.depproj patch | blob | history
tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj patch | blob | history
tests/src/Common/test_dependencies/test_dependencies.csproj patch | blob | history
tests/src/Common/test_runtime/test_runtime.csproj patch | blob | history
tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj patch | blob | history
tests/src/dir.props patch | blob | history

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7c7d790..4a4a7f8 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -18,13 +18,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>f5ccfdcbd828383d39cf583086ef42d72ca5b320</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-rc2.19458.3">
+    <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.7.0-preview1.19459.13">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-rc2.19458.3">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.0-preview1.19459.13">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
+      <Sha>2d38da41c8c153e498ea5fbda88c7532389b2f3f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19459.38">
       <Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a32a5b5..a971239 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -21,8 +21,8 @@
     <!-- roslyn -->
     <MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>
     <!-- corefx -->
-    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-rc2.19458.3</MicrosoftPrivateCoreFxNETCoreAppVersion>
-    <MicrosoftNETCorePlatformsVersion>3.0.0-rc2.19458.3</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftPrivateCoreFxNETCoreAppVersion>4.7.0-preview1.19459.13</MicrosoftPrivateCoreFxNETCoreAppVersion>
+    <MicrosoftNETCorePlatformsVersion>3.1.0-preview1.19459.13</MicrosoftNETCorePlatformsVersion>
     <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion>
     <!-- core-setup -->
     <MicrosoftNETCoreAppVersion>3.1.0-preview1.19459.38</MicrosoftNETCoreAppVersion>
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 5c4d1de..1a3e8d1 100644 (file)
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -3,8 +3,8 @@
 
   <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
   <ItemGroup>
-    <TestTargetFramework Include=".NETCoreApp,Version=v3.0">
-      <Folder>netcoreapp3.0</Folder>
+    <TestTargetFramework Include=".NETCoreApp,Version=v3.1">
+      <Folder>netcoreapp3.1</Folder>
     </TestTargetFramework>
   </ItemGroup>
 
diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
index c42cf53..75bccfa 100644 (file)
--- a/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -4,8 +4,8 @@
   <PropertyGroup>
       <RestoreOutputPath>$(SourceDir)Common\CoreFX\obj</RestoreOutputPath>
       <Language>C#</Language>
-      <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-      <TargetFramework>netcoreapp3.0</TargetFramework>
+      <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
+      <TargetFramework>netcoreapp3.1</TargetFramework>
       <ContainsPackageReferences>true</ContainsPackageReferences>
       <CLRTestKind>SharedLibrary</CLRTestKind>
       <IsTestProject>false</IsTestProject>
diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
index e4b1af7..ef58570 100644 (file)
--- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
+++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj
@@ -25,7 +25,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
index 6e07686..522befd 100644 (file)
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp3.1</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -33,7 +33,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj
index df58707..ee6316a 100644 (file)
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp3.1</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -27,7 +27,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
diff --git a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
index e393e50..7e33456 100644 (file)
--- a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
+++ b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj
@@ -5,8 +5,8 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
-    <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
+    <NugetTargetMoniker>.NETCoreApp,Version=v3.1</NugetTargetMoniker>
+    <NugetTargetMonikerShort>netcoreapp3.1</NugetTargetMonikerShort>
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
   <ItemGroup>
@@ -18,7 +18,7 @@
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
     <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;netcoreapp1.1;portable-net45+win8</PackageTargetFallback>
     <RuntimeIdentifiers>win-arm;win-arm64;win-x64;win-x86;$(TargetRid)</RuntimeIdentifiers>
diff --git a/tests/src/dir.props b/tests/src/dir.props
index c61035f..7b03cb8 100644 (file)
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -150,8 +150,8 @@
     <RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath>
 
     <!-- Specify the target framework of the common test dependency project.json. -->
-    <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
-    <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
+    <NuGetTargetMoniker>.NETCoreApp,Version=v3.1</NuGetTargetMoniker>
+    <NuGetTargetMonikerShort>netcoreapp3.1</NuGetTargetMonikerShort>
     <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
   </PropertyGroup>
 
Domain: Dotnet / Core;