diff options
| -rw-r--r-- | dependencies.props | 32 | ||||
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 19 | ||||
| -rw-r--r-- | src/tools/runincontext/runincontext.csproj | 2 | ||||
| -rw-r--r-- | tests/dir.sdkbuild.props | 2 | ||||
| -rw-r--r-- | tests/runtest.proj | 2 | ||||
| -rw-r--r-- | tests/src/Common/CoreFX/CoreFX.depproj | 62 | ||||
| -rw-r--r-- | tests/src/Common/test_dependencies/test_dependencies.csproj | 12 | ||||
| -rw-r--r-- | tests/src/Common/test_runtime/test_runtime.csproj | 2 | ||||
| -rw-r--r-- | tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj | 2 | ||||
| -rw-r--r-- | tests/src/JIT/Regression/JitBlue/GitHub_20958/GitHub_20958.cs | 8 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj | 8 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj | 4 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj | 2 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark/benchmark.csproj | 12 | ||||
| -rw-r--r-- | tests/src/performance/performance.csproj | 6 |
16 files changed, 84 insertions, 103 deletions
diff --git a/dependencies.props b/dependencies.props index 2d4da66a06..5b6694703e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,6 +10,8 @@ </RestoreSources> </PropertyGroup> + <Import Project="eng/Versions.props" /> + <PropertyGroup> <!-- Central place to set the versions of all nuget packages produced in the repo --> <PackageVersion Condition="'$(PackageVersion)' == ''">3.0.0</PackageVersion> @@ -23,21 +25,16 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>855b22a229d8730564b19474f9966779b1c4f12b</CoreFxCurrentRef> <CoreClrCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</CoreClrCurrentRef> <BuildToolsCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</BuildToolsCurrentRef> <PgoDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</PgoDataCurrentRef> - <CoreSetupCurrentRef>855b22a229d8730564b19474f9966779b1c4f12b</CoreSetupCurrentRef> <IbcDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</IbcDataCurrentRef> </PropertyGroup> <!-- Tests/infrastructure dependency versions. --> <PropertyGroup> - <MicrosoftPrivateCoreFxNETCoreAppPackageVersion>4.6.0-preview.19106.8</MicrosoftPrivateCoreFxNETCoreAppPackageVersion> - <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview.19106.8</MicrosoftNETCorePlatformsPackageVersion> <PgoDataPackageVersion>99.99.99-master-20190130.3</PgoDataPackageVersion> <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview-27316-02</MicrosoftNETCoreRuntimeCoreCLRPackageVersion> - <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27406-8</MicrosoftNETCoreAppPackageVersion> <XunitPackageVersion>2.4.1</XunitPackageVersion> <IbcDataPackageVersion>99.99.99-master-20190130.3</IbcDataPackageVersion> <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion> @@ -77,10 +74,6 @@ </PropertyGroup> <ItemGroup> - <RemoteDependencyBuildInfo Include="CoreFx"> - <BuildInfoPath>$(BaseDotNetBuildInfo)corefx/$(DependencyBranch)</BuildInfoPath> - <CurrentRef>$(CoreFxCurrentRef)</CurrentRef> - </RemoteDependencyBuildInfo> <RemoteDependencyBuildInfo Include="CoreClr"> <BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath> <CurrentRef>$(CoreClrCurrentRef)</CurrentRef> @@ -97,35 +90,16 @@ <BuildInfoPath>$(BaseDotNetBuildInfo)optimization/$(DependencyBranch)/IBC</BuildInfoPath> <CurrentRef>$(IbcDataCurrentRef)</CurrentRef> </RemoteDependencyBuildInfo> - <RemoteDependencyBuildInfo Include="CoreSetup"> - <BuildInfoPath>$(BaseDotNetBuildInfo)core-setup/$(DependencyBranch)</BuildInfoPath> - <CurrentRef>$(CoreSetupCurrentRef)</CurrentRef> - </RemoteDependencyBuildInfo> - + <DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)"> <RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl> </DependencyBuildInfo> - <XmlUpdateStep Include="CoreFx"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>MicrosoftPrivateCoreFxNETCoreAppPackageVersion</ElementName> - <PackageId>Microsoft.Private.CoreFx.NETCoreApp</PackageId> - </XmlUpdateStep> - <XmlUpdateStep Include="CoreFx"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>MicrosoftNETCorePlatformsPackageVersion</ElementName> - <PackageId>Microsoft.NETCore.Platforms</PackageId> - </XmlUpdateStep> <XmlUpdateStep Include="CoreClr"> <Path>$(MSBuildThisFileFullPath)</Path> <ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName> <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId> </XmlUpdateStep> - <XmlUpdateStep Include="CoreSetup"> - <Path>$(MSBuildThisFileFullPath)</Path> - <ElementName>MicrosoftNETCoreAppPackageVersion</ElementName> - <PackageId>Microsoft.NETCore.App</PackageId> - </XmlUpdateStep> <UpdateStep Include="BuildTools"> <UpdaterType>File</UpdaterType> <Path>$(MSBuildThisFileDirectory)BuildToolsVersion.txt</Path> diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16c6eb96c2..77c4682bee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,5 +10,17 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>9a5da1c8a3232c6304955c7a6ffe6109a1b13d9f</Sha> </Dependency> + <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview.19111.8"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>e8e469653ca46e0499c925dfaaea796fc6f61cb0</Sha> + </Dependency> + <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview.19111.8"> + <Uri>https://github.com/dotnet/corefx</Uri> + <Sha>e8e469653ca46e0499c925dfaaea796fc6f61cb0</Sha> + </Dependency> + <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview-27411-7"> + <Uri>https://github.com/dotnet/core-setup</Uri> + <Sha>70f92292e7302beb9d95933f80421e416bd42ebe</Sha> + </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index e69fd0b8c9..28aa600936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,19 +8,14 @@ <UsingToolXliff>false</UsingToolXliff> <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> <MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNetFrameworkReferenceAssembliesVersion> - <!-- Libs --> + <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview.19111.8</MicrosoftPrivateCoreFxNETCoreAppVersion> + <MicrosoftNETCorePlatformsVersion>3.0.0-preview.19111.8</MicrosoftNETCorePlatformsVersion> + <MicrosoftNETCoreAppVersion>3.0.0-preview-27411-7</MicrosoftNETCoreAppVersion> </PropertyGroup> + <!--Package names--> <PropertyGroup> - <!-- Override arcade package version to use most recent signing - package --> - <MicrosoftDotNetSignToolVersion>1.0.0-beta.19067.6</MicrosoftDotNetSignToolVersion> - </PropertyGroup> - <PropertyGroup> - <RestoreSources> - $(RestoreSources); - https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://dotnet.myget.org/F/symreader-converter/api/v3/index.json; - https:%2F%2Fdotnet.myget.org/F/symreader/api/v3/index.json - </RestoreSources> + <MicrosoftPrivateCoreFxNETCoreAppPackage>Microsoft.Private.CoreFx.NETCoreApp</MicrosoftPrivateCoreFxNETCoreAppPackage> + <MicrosoftNETCorePlatformsPackage>Microsoft.NETCore.Platforms</MicrosoftNETCorePlatformsPackage> + <MicrosoftNETCoreAppPackage>Microsoft.NETCore.App</MicrosoftNETCoreAppPackage> </PropertyGroup> </Project> diff --git a/src/tools/runincontext/runincontext.csproj b/src/tools/runincontext/runincontext.csproj index b5329eb4a0..ee5ab21ab9 100644 --- a/src/tools/runincontext/runincontext.csproj +++ b/src/tools/runincontext/runincontext.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> <TargetFramework>netcoreapp3.0</TargetFramework> - <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> + <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion> <UseAppHost>false</UseAppHost> <CLRTestKind>BuildOnly</CLRTestKind> </PropertyGroup> diff --git a/tests/dir.sdkbuild.props b/tests/dir.sdkbuild.props index bc5bed9b3f..5f33e61c83 100644 --- a/tests/dir.sdkbuild.props +++ b/tests/dir.sdkbuild.props @@ -7,7 +7,7 @@ <PropertyGroup> <TargetFramework>netcoreapp3.0</TargetFramework> - <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> + <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <Platform>AnyCPU</Platform> diff --git a/tests/runtest.proj b/tests/runtest.proj index a662a288aa..40563b3165 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -103,7 +103,7 @@ $(_XunitEpilog) <PropertyGroup> <OutputPath>$(XUnitTestBinBase)\$(CategoryWithSlash)</OutputPath> - <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> + <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion> </PropertyGroup> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj index 0abf711952..44196866e9 100644 --- a/tests/src/Common/CoreFX/CoreFX.depproj +++ b/tests/src/Common/CoreFX/CoreFX.depproj @@ -58,10 +58,10 @@ <Version>$(MicrosoftPrivateCoreFxTestUtilitiesPackageVersion)</Version> </PackageReference> <PackageReference Include="System.CodeDom"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Configuration.ConfigurationManager"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Composition.Hosting"> <Version>$(SystemCompositionVersions)</Version> @@ -79,95 +79,95 @@ <Version>$(SystemCompositionVersions)</Version> </PackageReference> <PackageReference Include="System.ComponentModel.Composition"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Data.DataSetExtensions"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Data.Odbc"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Data.SqlClient"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Diagnostics.PerformanceCounter"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.DirectoryServices"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.DirectoryServices.AccountManagement"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.DirectoryServices.Protocols"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Drawing.Common"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.IO.Packaging"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.IO.Pipelines"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.IO.Ports"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Management"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Net.Http.WinHttpHandler"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Net.WebSockets.WebSocketProtocol"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime.Caching"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Reflection.Context"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Security.Cryptography.ProtectedData"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Security.Cryptography.Pkcs"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Security.Cryptography.Xml"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.ServiceModel.Syndication"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.ServiceProcess.ServiceController"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Text.Encoding.CodePages"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Text.Encodings.Web"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Threading.AccessControl"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Threading.Channels"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Json"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> </ItemGroup> <ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'"> <!-- Windows Dependencies --> <PackageReference Include="Microsoft.Win32.Registry.AccessControl"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.Win32.SystemEvents"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent"> <Version>$(MicrosoftDiagnosticsTracingTraceVentVersion)</Version> diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index ea54d45112..ceec7d6444 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -11,22 +11,22 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Memory"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Security.Permissions"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Diagnostics.EventLog"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Drawing.Common"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> </ItemGroup> <PropertyGroup> diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 761d44d4c6..5ba990cce5 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -11,7 +11,7 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.NETCore.Platforms"> - <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + <Version>$(MicrosoftNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.DotNet.CoreCLR.TestDependencies"> <Version>1.0.0-prerelease</Version> diff --git a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj index 344deec781..81c06a3f3c 100644 --- a/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj +++ b/tests/src/Interop/COM/NETClients/Primitives/NETClientPrimitives.csproj @@ -43,7 +43,7 @@ <ProjectReference Include="../../NativeServer/CMakeLists.txt" /> <ProjectReference Include="../../../../Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" /> <PackageReference Include="System.Drawing.Common"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_20958/GitHub_20958.cs b/tests/src/JIT/Regression/JitBlue/GitHub_20958/GitHub_20958.cs index cf5a4e318d..45730f5ee4 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_20958/GitHub_20958.cs +++ b/tests/src/JIT/Regression/JitBlue/GitHub_20958/GitHub_20958.cs @@ -16,14 +16,14 @@ public class GitHub_20958 int returnVal = 100; ReadOnlySpan<char> span = "Hello".AsSpan(); - ReadOnlySpan<char> sliced = span[Range.Create(new Index(1, fromEnd: false), new Index(1, fromEnd: true))]; + ReadOnlySpan<char> sliced = span[new Range(new Index(1, fromEnd: false), new Index(1, fromEnd: true))]; if (span.Slice(1, 3) != sliced) { returnVal = -1; } try { - ReadOnlySpan<char> s = "Hello".AsSpan()[Range.Create(new Index(1, fromEnd: true), new Index(1, fromEnd: false))]; + ReadOnlySpan<char> s = "Hello".AsSpan()[new Range(new Index(1, fromEnd: true), new Index(1, fromEnd: false))]; returnVal = -1; } catch (ArgumentOutOfRangeException) @@ -34,14 +34,14 @@ public class GitHub_20958 returnVal = -1; } Span<char> span1 = new Span<char>(new char[] { 'H', 'e', 'l', 'l', 'o' }); - Span<char> sliced1 = span1[Range.Create(new Index(2, fromEnd: false), new Index(1, fromEnd: true))]; + Span<char> sliced1 = span1[new Range(new Index(2, fromEnd: false), new Index(1, fromEnd: true))]; if (span1.Slice(2, 2) != sliced1) { returnVal = -1; } try { - Span<char> s = new Span<char>(new char[] { 'H', 'i' })[Range.Create(new Index(0, fromEnd: true), new Index(1, fromEnd: false))]; + Span<char> s = new Span<char>(new char[] { 'H', 'i' })[new Range(new Index(0, fromEnd: true), new Index(1, fromEnd: false))]; returnVal = -1; } catch (ArgumentOutOfRangeException) diff --git a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj index 87a408d339..5a8ef797e7 100644 --- a/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj +++ b/tests/src/JIT/config/benchmark+intrinsic/benchmark+intrinsic.csproj @@ -11,13 +11,13 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Memory"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> </ItemGroup> <PropertyGroup> @@ -31,4 +31,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj index 881d84ff55..625ab1bb05 100644 --- a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -26,7 +26,7 @@ <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.NETCore.Platforms"> - <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + <Version>$(MicrosoftNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Console"> <Version>4.4.0-beta-24913-02</Version> @@ -99,4 +99,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj index d2789e5957..ec14833eb8 100644 --- a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -23,7 +23,7 @@ <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.NETCore.Platforms"> - <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + <Version>$(MicrosoftNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="Newtonsoft.Json"> <Version>7.0.1</Version> diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj index aecfdec277..caf1429746 100644 --- a/tests/src/JIT/config/benchmark/benchmark.csproj +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -23,7 +23,7 @@ <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.NETCore.Platforms"> - <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + <Version>$(MicrosoftNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Collections.NonGeneric"> <Version>4.4.0-beta-24913-02</Version> @@ -44,10 +44,10 @@ <Version>4.4.0-beta-24913-02</Version> </PackageReference> <PackageReference Include="System.Memory"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Numerics.Vectors"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Reflection"> <Version>4.4.0-beta-24913-02</Version> @@ -56,13 +56,13 @@ <Version>4.4.0-beta-24913-02</Version> </PackageReference> <PackageReference Include="System.Reflection.TypeExtensions"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime"> <Version>4.4.0-beta-24913-02</Version> </PackageReference> <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime.Extensions"> <Version>4.4.0-beta-24913-02</Version> @@ -114,4 +114,4 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Target Name="Build" DependsOnTargets="ResolveReferences" /> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj index 4c3d2aa3d3..f2c605e221 100644 --- a/tests/src/performance/performance.csproj +++ b/tests/src/performance/performance.csproj @@ -23,7 +23,7 @@ <Version>$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)</Version> </PackageReference> <PackageReference Include="Microsoft.NETCore.Platforms"> - <Version>$(MicrosoftNETCorePlatformsPackageVersion)</Version> + <Version>$(MicrosoftNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Collections.NonGeneric"> <Version>4.4.0-beta-24913-02</Version> @@ -41,7 +41,7 @@ <Version>4.4.0-beta-24913-02</Version> </PackageReference> <PackageReference Include="System.Numerics.Vectors"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Reflection"> <Version>4.4.0-beta-24913-02</Version> @@ -50,7 +50,7 @@ <Version>4.4.0-beta-24913-02</Version> </PackageReference> <PackageReference Include="System.Reflection.TypeExtensions"> - <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version> + <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version> </PackageReference> <PackageReference Include="System.Runtime"> <Version>4.4.0-beta-24913-02</Version> |