summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BuildToolsVersion.txt2
-rw-r--r--ILAsmVersion.txt2
-rw-r--r--dependencies.props18
-rw-r--r--tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json16
-rw-r--r--tests/publishdependency.targets4
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj2
-rw-r--r--tests/src/Common/test_dependencies/test_dependencies.csproj6
-rw-r--r--tests/src/Common/test_runtime/test_runtime.csproj6
-rw-r--r--tests/src/dir.props4
9 files changed, 37 insertions, 23 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt
index 27839f0817..bd0d34dd3a 100644
--- a/BuildToolsVersion.txt
+++ b/BuildToolsVersion.txt
@@ -1 +1 @@
-2.2.0-preview1-02920-01
+2.2.0-preview1-02928-01
diff --git a/ILAsmVersion.txt b/ILAsmVersion.txt
index 1e72fc8f64..2eb2abc1ff 100644
--- a/ILAsmVersion.txt
+++ b/ILAsmVersion.txt
@@ -1 +1 @@
-2.2.0-preview1-26621-01
+3.0.0-preview1-26627-04
diff --git a/dependencies.props b/dependencies.props
index ed8514b8eb..8952463396 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -23,18 +23,18 @@
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<PropertyGroup>
- <CoreFxCurrentRef>232e7f9230fcc7c6c8ea8c955e113f897403a0e7</CoreFxCurrentRef>
- <CoreClrCurrentRef>232e7f9230fcc7c6c8ea8c955e113f897403a0e7</CoreClrCurrentRef>
- <BuildToolsCurrentRef>3b09a6a5fd370dfb8b7af43ca0a93114efdaa0a1</BuildToolsCurrentRef>
- <PgoDataCurrentRef>1f57485574742714a2401175bce892597bbf86bb</PgoDataCurrentRef>
+ <CoreFxCurrentRef>f9173f18d54ab4e842be4b5d0a0df47323a1451b</CoreFxCurrentRef>
+ <CoreClrCurrentRef>f9173f18d54ab4e842be4b5d0a0df47323a1451b</CoreClrCurrentRef>
+ <BuildToolsCurrentRef>f9173f18d54ab4e842be4b5d0a0df47323a1451b</BuildToolsCurrentRef>
+ <PgoDataCurrentRef>f9173f18d54ab4e842be4b5d0a0df47323a1451b</PgoDataCurrentRef>
</PropertyGroup>
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
- <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview1-26621-01</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
- <MicrosoftNETCorePlatformsPackageVersion>2.2.0-preview1-26621-01</MicrosoftNETCorePlatformsPackageVersion>
- <PgoDataPackageVersion>99.99.99-master-20180621-0050</PgoDataPackageVersion>
- <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.2.0-preview1-26621-01</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+ <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview1-26627-04</MicrosoftPrivateCoreFxNETCoreAppPackageVersion>
+ <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview1-26627-04</MicrosoftNETCorePlatformsPackageVersion>
+ <PgoDataPackageVersion>99.99.99-master-20180627-0051</PgoDataPackageVersion>
+ <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview1-26627-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
<XunitConsoleNetcorePackageVersion>2.2.0-preview1-02830-02</XunitConsoleNetcorePackageVersion>
<XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
@@ -51,7 +51,7 @@
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
- <FeedTasksPackageVersion>2.2.0-preview1-02920-01</FeedTasksPackageVersion>
+ <FeedTasksPackageVersion>2.2.0-preview1-02928-01</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Publish symbol build task package -->
diff --git a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
index 5518056a1f..8c79b9641f 100644
--- a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
+++ b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
@@ -1264,5 +1264,19 @@
}
]
}
+ },
+ {
+ "name": "System.Security.Cryptography.X509Certificates.Tests",
+ "enabled": true,
+ "exclusions": {
+ "namespaces": null,
+ "classes": null,
+ "methods": [
+ {
+ "name": "System.Security.Cryptography.X509Certificates.Tests.X509StoreTests.Constructor_DefaultStoreName",
+ "reason": "Expected: My\r\nActual: MY\r\n"
+ }
+ ]
+ }
}
-] \ No newline at end of file
+]
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index 82f383f2cd..346b1749f8 100644
--- 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=v2.2">
- <Folder>netcoreapp2.2</Folder>
+ <TestTargetFramework Include=".NETCoreApp,Version=v3.0">
+ <Folder>netcoreapp3.0</Folder>
</TestTargetFramework>
</ItemGroup>
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 fac75781a5..e4b1af7130 100644
--- 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>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp3.0</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 3bdca6de20..cc4d1a7ff8 100644
--- 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=v2.2</NugetTargetMoniker>
- <NugetTargetMonikerShort>netcoreapp2.2</NugetTargetMonikerShort>
+ <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
+ <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<ItemGroup>
@@ -30,7 +30,7 @@
</PackageReference>
</ItemGroup>
<PropertyGroup>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp3.0</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 7405edcbff..761d44d4c6 100644
--- 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=v2.2</NugetTargetMoniker>
- <NugetTargetMonikerShort>netcoreapp2.2</NugetTargetMonikerShort>
+ <NugetTargetMoniker>.NETCoreApp,Version=v3.0</NugetTargetMoniker>
+ <NugetTargetMonikerShort>netcoreapp3.0</NugetTargetMonikerShort>
<IsTestProject>false</IsTestProject>
</PropertyGroup>
<ItemGroup>
@@ -27,7 +27,7 @@
</PackageReference>
</ItemGroup>
<PropertyGroup>
- <TargetFramework>netcoreapp2.2</TargetFramework>
+ <TargetFramework>netcoreapp3.0</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/dir.props b/tests/src/dir.props
index abdb7cc0f5..925e3faba7 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -95,8 +95,8 @@
<RestoreOutputPath>$(MSBuildProjectDirectory)\obj</RestoreOutputPath>
<!-- Specify the target framework of the common test dependency project.json. -->
- <NuGetTargetMoniker>.NETCoreApp,Version=v2.2</NuGetTargetMoniker>
- <NuGetTargetMonikerShort>netcoreapp2.2</NuGetTargetMonikerShort>
+ <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
+ <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
<PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
</PropertyGroup>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:38:59 +0000