diff options
35 files changed, 55 insertions, 55 deletions
diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md b/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md index 48b1f3b47..d5b38f8ee 100644 --- a/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md +++ b/Documentation/how-to-build-and-run-ilcompiler-in-console-shell-prompt.md @@ -14,9 +14,9 @@ This will result in the following: - Build native and managed components of ILCompiler. The final binaries are placed to `<repo_root>\bin\<OS>.<arch>.<Config>\tools`. - Build and run tests -# Install .NET Core 2.0 SDK +# Install .NET Core 2.1 SDK -* Download .NET Core 2.0 SDK from [https://www.microsoft.com/net/download/core](https://www.microsoft.com/net/download/core) +* Download .NET Core 2.1 SDK from [https://www.microsoft.com/net/download/core](https://www.microsoft.com/net/download/core) * On windows ensure you are using the 'x64 Native Tools Command Prompt for VS 2017' (This is distinct from the 'Developer Command Prompt for VS 2017') @@ -35,7 +35,7 @@ You should now be able to use the `dotnet` commands of the CLI tools. <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <Import Project="$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\Sdk.targets" /> @@ -61,7 +61,7 @@ From the shell/command prompt, issue the following commands, from the folder con dotnet publish -r win-x64|linux-x64|osx-x64 ``` -Native executable will be dropped in `./bin/x64/[configuration]/netcoreapp2.0/publish/` folder and will have the same name as the folder in which your source file is present. +Native executable will be dropped in `./bin/x64/[configuration]/netcoreapp2.1/publish/` folder and will have the same name as the folder in which your source file is present. ## Using CPP Code Generator ## @@ -93,7 +93,7 @@ If you are seeing errors such as: ``` libcpmtd.lib(nothrow.obj) : fatal error LNK1112: module machine type 'X86' conflicts with target machine type 'x64' [C:\Users\[omitted]\nativetest\app\app.csproj] -C:\Users\[omitted]\nativetest\bin\Windows_NT.x64.Debug\build\Microsoft.NETCore.Native.targets(151,5): error MSB3073: The command "link @"obj\Debug\netcoreapp1.0\native\link.rsp"" exited with code 1112. [C:\Users\[omitted]\nativetest\app\app.csproj] +C:\Users\[omitted]\nativetest\bin\Windows_NT.x64.Debug\build\Microsoft.NETCore.Native.targets(151,5): error MSB3073: The command "link @"obj\Debug\netcoreapp2.1\native\link.rsp"" exited with code 1112. [C:\Users\[omitted]\nativetest\app\app.csproj] ``` or diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md b/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md index e17ca9bbc..43bf635a9 100644 --- a/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md +++ b/Documentation/how-to-build-and-run-ilcompiler-in-vscode.md @@ -49,7 +49,7 @@ dotnet build /t:LinkNative /t:Rebuild /v:Detailed | grep ".ilc.rsp" Once you have the ilc path, you can change ```launch.json``` accordingly: ```json - "args": ["@obj/Debug/netcoreapp1.0/native/<netcore_app_name>.ilc.rsp"], + "args": ["@obj/Debug/netcoreapp2.1/native/<netcore_app_name>.ilc.rsp"], "cwd": "<netcore_app_root_folder>", ``` diff --git a/dependencies.props b/dependencies.props index 54eaed7cb..28bb619d1 100644 --- a/dependencies.props +++ b/dependencies.props @@ -5,7 +5,7 @@ <CoreFxVersion>4.6.0-preview1-26617-01</CoreFxVersion> <CoreFxUapVersion>4.7.0-preview1-26617-01</CoreFxUapVersion> <MicrosoftNETCoreNativeVersion>2.2.0-preview1-26620-01</MicrosoftNETCoreNativeVersion> - <MicrosoftNETCoreAppPackageVersion>2.0.0</MicrosoftNETCoreAppPackageVersion> + <MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion> <XunitNetcoreExtensionsVersion>1.0.1-prerelease-02104-02</XunitNetcoreExtensionsVersion> </PropertyGroup> </Project> @@ -254,7 +254,7 @@ <PropertyGroup> <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> - <NuGetTargetMoniker Condition="'$(NuGetTargetFramework)' == ''">.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <NuGetTargetMoniker Condition="'$(NuGetTargetFramework)' == ''">.NETCoreApp,Version=v2.1</NuGetTargetMoniker> <BuildPackageLibraryReferences>false</BuildPackageLibraryReferences> </PropertyGroup> diff --git a/dir.targets b/dir.targets index ba5405fa2..8d8b5e3f2 100644 --- a/dir.targets +++ b/dir.targets @@ -17,11 +17,11 @@ <CLSCompliant Condition="'$(CLSCompliant)'==''">false</CLSCompliant> </PropertyGroup> - <!-- Set default references for netcoreapp2.0 --> - <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'"> + <!-- Set default references for netcoreapp2.1 --> + <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> <!-- This tells VS that this is .NET Core app - uses .NET Core debugger, IntelliSense, etc. --> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v2.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v2.1</TargetFrameworkVersion> </PropertyGroup> <!-- Set default references for netstandard1.3 --> diff --git a/init-tools.msbuild b/init-tools.msbuild index 1ec33f678..f515eb968 100644 --- a/init-tools.msbuild +++ b/init-tools.msbuild @@ -1,6 +1,6 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp1.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <EnableDefaultItems>false</EnableDefaultItems> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion)</BaseIntermediateOutputPath> diff --git a/init-tools.sh b/init-tools.sh index 06c4b1569..06c129716 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -131,7 +131,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Initializing BuildTools..." echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR" >> $__init_tools_log - # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + # Executables restored with .NET Core 2.1 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 chmod +x $__BUILD_TOOLS_PATH/init-tools.sh $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_DIR >> $__init_tools_log if [ "$?" != "0" ]; then @@ -142,7 +142,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi echo "Making all .sh files executable under Tools." - # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + # Executables restored with .NET Core 2.1 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 ls $__scriptpath/Tools/*.sh | xargs chmod +x ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x diff --git a/pkg/Microsoft.DotNet.ILVerification/Microsoft.DotNet.ILVerification.pkgproj b/pkg/Microsoft.DotNet.ILVerification/Microsoft.DotNet.ILVerification.pkgproj index 00470202e..4db2b82e4 100644 --- a/pkg/Microsoft.DotNet.ILVerification/Microsoft.DotNet.ILVerification.pkgproj +++ b/pkg/Microsoft.DotNet.ILVerification/Microsoft.DotNet.ILVerification.pkgproj @@ -8,7 +8,7 @@ <PackagePlatforms>x64;</PackagePlatforms> <SignAssembly>true</SignAssembly> <AssemblyOriginatorKeyFile>$(PackageSourceDirectory)\BuildIntegration\StrongNameKeys\ILVerify.snk</AssemblyOriginatorKeyFile> - <PackageTargetFramework>netcoreapp2.0</PackageTargetFramework> + <PackageTargetFramework>netcoreapp2.1</PackageTargetFramework> <!-- Override this property so that the package name won't look like runtime.[RID].[TFM].[ID] --> <PackageTargetRuntime></PackageTargetRuntime> </PropertyGroup> diff --git a/pkg/Microsoft.TargetingPack.Private.CoreRT/Microsoft.TargetingPack.Private.CoreRT.pkgproj b/pkg/Microsoft.TargetingPack.Private.CoreRT/Microsoft.TargetingPack.Private.CoreRT.pkgproj index 2598926b4..7835ad32f 100644 --- a/pkg/Microsoft.TargetingPack.Private.CoreRT/Microsoft.TargetingPack.Private.CoreRT.pkgproj +++ b/pkg/Microsoft.TargetingPack.Private.CoreRT/Microsoft.TargetingPack.Private.CoreRT.pkgproj @@ -5,7 +5,7 @@ <SkipPackageFileCheck>true</SkipPackageFileCheck> <BaseLinePackageDependencies>false</BaseLinePackageDependencies> <PackagePlatforms>x64;</PackagePlatforms> - <PackageTargetFramework>netcoreapp2.0</PackageTargetFramework> + <PackageTargetFramework>netcoreapp2.1</PackageTargetFramework> <!-- Override this property so that the package name won't look like runtime.[RID].[TFM].[ID] --> <PackageTargetRuntime></PackageTargetRuntime> </PropertyGroup> diff --git a/samples/HelloWorld/HelloWorld.csproj b/samples/HelloWorld/HelloWorld.csproj index a10d61651..2d34a08cb 100644 --- a/samples/HelloWorld/HelloWorld.csproj +++ b/samples/HelloWorld/HelloWorld.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/samples/HelloWorld/README.md b/samples/HelloWorld/README.md index 6d79ea05e..37377313b 100644 --- a/samples/HelloWorld/README.md +++ b/samples/HelloWorld/README.md @@ -50,6 +50,6 @@ where `<Configuration>` is your project configuration (such as Debug or Release) > dotnet publish -r win-x64 -c release ``` -Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.0/publish/`. Navigate to `/bin/x64/<Configuration>/netcoreapp2.0/publish/` in your project folder and run the produced native executable. +Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.1/publish/`. Navigate to `/bin/x64/<Configuration>/netcoreapp2.1/publish/` in your project folder and run the produced native executable. Feel free to modify the sample application and experiment. However, keep in mind some functionality might not yet be supported in CoreRT. Let us know on the [Issues page](https://github.com/dotnet/corert/issues/). diff --git a/samples/MonoGame/NeonShooter.csproj b/samples/MonoGame/NeonShooter.csproj index d36f07fb8..44f0ef31b 100644 --- a/samples/MonoGame/NeonShooter.csproj +++ b/samples/MonoGame/NeonShooter.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <OutputType>WinExe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <DefineConstants>$(DefineConstants);WINDOWS;LINUX</DefineConstants> </PropertyGroup> diff --git a/samples/MonoGame/Platformer2D.csproj b/samples/MonoGame/Platformer2D.csproj index 3d2397e2c..767f2ad86 100644 --- a/samples/MonoGame/Platformer2D.csproj +++ b/samples/MonoGame/Platformer2D.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <OutputType>WinExe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <DefineConstants>$(DefineConstants);WINDOWS;LINUX</DefineConstants> </PropertyGroup> diff --git a/samples/MonoGame/README.md b/samples/MonoGame/README.md index 79c20a2d3..bbe30394b 100644 --- a/samples/MonoGame/README.md +++ b/samples/MonoGame/README.md @@ -59,7 +59,7 @@ where `<Configuration>` is your project configuration (such as Debug or Release) > dotnet publish -r win-x64 -c release ``` -Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.0/publish/`. Navigate to `/bin/x64/<Configuration>/netcoreapp2.0/publish/` in your project folder and run the produced native executable. +Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.1/publish/`. Navigate to `/bin/x64/<Configuration>/netcoreapp2.1/publish/` in your project folder and run the produced native executable. ## Try MonoGame sample game @@ -73,7 +73,7 @@ MonoGame samples include project files for number of targets, but not for .NET C ```bash > dotnet publish -r win-x64 -c release Platformer2D.csproj -> bin\x64\Release\netcoreapp2.0\publish\Platformer2D.exe +> bin\x64\Release\netcoreapp2.1\publish\Platformer2D.exe ``` The NeonShooter sample works on Windows-only due to https://github.com/MonoGame/MonoGame/issues/3270. diff --git a/samples/WebApi/README.md b/samples/WebApi/README.md index d9b3d9b5c..2d0b07e13 100644 --- a/samples/WebApi/README.md +++ b/samples/WebApi/README.md @@ -83,9 +83,9 @@ where path_to_rdxml_file is the location of the file on your disk. Under the second `<ItemGroup>` remove the line containing a reference to `Microsoft.AspNetCore.All` and substitute it with: ```xml -<PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" /> -<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" /> -<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.0.1" /> +<PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" /> +<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0" /> +<PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.0" /> ``` This substitution removes unnecessary package references added by AspNetCore.All, which will remove them from your application's published files and avoid encountering unsupported features, as described in [the section above](#add-core-mvc-services) @@ -129,12 +129,12 @@ where `<Configuration>` is your project configuration (such as Debug or Release) > dotnet publish -r win-x64 -c release ``` -Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.0/publish/` +Once completed, you can find the native executable in the root folder of your project under `/bin/x64/<Configuration>/netcoreapp2.1/publish/` ## Try it out! If you are running macOS, make sure you have [libuv](https://github.com/libuv/libuv) installed, as ASP.NET is built on top of libuv. You can use [homebrew](https://brew.sh/) to get it (`brew install libuv`). -Navigate to `/bin/x64/<Configuration>/netcoreapp2.0/publish/` in your project folder and run the produced executable. It should display "Now listening on: http://localhost:XXXX" with XXXX being a port on your machine. Open your browser and navigate to that URL. You should see "Hello World!" displayed in your browser. +Navigate to `/bin/x64/<Configuration>/netcoreapp2.1/publish/` in your project folder and run the produced executable. It should display "Now listening on: http://localhost:XXXX" with XXXX being a port on your machine. Open your browser and navigate to that URL. You should see "Hello World!" displayed in your browser. Feel free to modify the sample application and experiment. However, keep in mind some functionality might not yet be supported in CoreRT. Let us know on the [Issues page](https://github.com/dotnet/corert/issues/). diff --git a/samples/WebApi/SampleWebApi.csproj b/samples/WebApi/SampleWebApi.csproj index 724c9b9c7..c143a4caf 100644 --- a/samples/WebApi/SampleWebApi.csproj +++ b/samples/WebApi/SampleWebApi.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> @@ -13,9 +13,9 @@ </ItemGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore" Version="2.0.1" /> - <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.0.1" /> - <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.0.1" /> + <PackageReference Include="Microsoft.AspNetCore" Version="2.1.0" /> + <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.1.0" /> + <PackageReference Include="Microsoft.AspNetCore.Mvc.Formatters.Json" Version="2.1.0" /> <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-*" /> </ItemGroup> diff --git a/src/Common/test-runtime/XUnit.Runtime.depproj b/src/Common/test-runtime/XUnit.Runtime.depproj index 5f1674de3..de12bce81 100644 --- a/src/Common/test-runtime/XUnit.Runtime.depproj +++ b/src/Common/test-runtime/XUnit.Runtime.depproj @@ -5,7 +5,7 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> <RuntimeIdentifiers>win-x64</RuntimeIdentifiers> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <RidSpecificAssets>true</RidSpecificAssets> <OutputPath>$(RuntimePath)</OutputPath> <!-- Don't warn if some dependencies were rolled forward --> diff --git a/src/Framework/Framework-native.depproj b/src/Framework/Framework-native.depproj index cc3093531..a83f57d93 100644 --- a/src/Framework/Framework-native.depproj +++ b/src/Framework/Framework-native.depproj @@ -6,8 +6,8 @@ </PropertyGroup> <PropertyGroup> - <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> - <TargetFramework>netcoreapp2.0</TargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.1</TargetFramework> <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> diff --git a/src/ILCompiler.Build.Tasks/src/ComputeManagedAssemblies.cs b/src/ILCompiler.Build.Tasks/src/ComputeManagedAssemblies.cs index 0e4998ece..e1435b0c6 100644 --- a/src/ILCompiler.Build.Tasks/src/ComputeManagedAssemblies.cs +++ b/src/ILCompiler.Build.Tasks/src/ComputeManagedAssemblies.cs @@ -24,7 +24,7 @@ namespace Build.Tasks } /// <summary> - /// The CoreRT-specific System.Private.* assemblies that must be used instead of the netcoreapp2.0 versions. + /// The CoreRT-specific System.Private.* assemblies that must be used instead of the netcoreapp2.1 versions. /// </summary> [Required] public ITaskItem[] SdkAssemblies diff --git a/src/ILCompiler/ObjectWriter/ObjectWriter.depproj b/src/ILCompiler/ObjectWriter/ObjectWriter.depproj index d399cc92b..6046fd628 100644 --- a/src/ILCompiler/ObjectWriter/ObjectWriter.depproj +++ b/src/ILCompiler/ObjectWriter/ObjectWriter.depproj @@ -5,8 +5,8 @@ </PropertyGroup> <PropertyGroup> - <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> - <TargetFramework>netcoreapp2.0</TargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.1</TargetFramework> <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> diff --git a/src/ILCompiler/RyuJIT/RyuJIT.depproj b/src/ILCompiler/RyuJIT/RyuJIT.depproj index 1eb94f741..c8aa48a87 100644 --- a/src/ILCompiler/RyuJIT/RyuJIT.depproj +++ b/src/ILCompiler/RyuJIT/RyuJIT.depproj @@ -5,8 +5,8 @@ </PropertyGroup> <PropertyGroup> - <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> - <TargetFramework>netcoreapp2.0</TargetFramework> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.1</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.1</TargetFramework> <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> diff --git a/src/ILCompiler/netcoreapp/ilc.csproj b/src/ILCompiler/netcoreapp/ilc.csproj index 1feb02316..06240cfef 100644 --- a/src/ILCompiler/netcoreapp/ilc.csproj +++ b/src/ILCompiler/netcoreapp/ilc.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler/repro/repro.csproj b/src/ILCompiler/repro/repro.csproj index 5e3e75312..4a81549b0 100644 --- a/src/ILCompiler/repro/repro.csproj +++ b/src/ILCompiler/repro/repro.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> <AssemblyName>repro</AssemblyName> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <SkipSigning>true</SkipSigning> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> diff --git a/src/ILCompiler/repro/repro.ilproj b/src/ILCompiler/repro/repro.ilproj index 2c4942695..8fdd23d40 100644 --- a/src/ILCompiler/repro/repro.ilproj +++ b/src/ILCompiler/repro/repro.ilproj @@ -3,7 +3,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> <AssemblyName>repro</AssemblyName> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <SkipSigning>true</SkipSigning> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler/src/ILCompiler.csproj b/src/ILCompiler/src/ILCompiler.csproj index 75d6ba4e2..4e437223e 100644 --- a/src/ILCompiler/src/ILCompiler.csproj +++ b/src/ILCompiler/src/ILCompiler.csproj @@ -8,7 +8,7 @@ <RootNamespace>ILCompiler</RootNamespace> <AssemblyName>ilc</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <CopyNugetImplementations>false</CopyNugetImplementations> <!-- Force .dll extension even if output type is exe. --> <TargetExt>.dll</TargetExt> diff --git a/src/ILVerify/README.md b/src/ILVerify/README.md index ef4d0d81f..60aa79f48 100644 --- a/src/ILVerify/README.md +++ b/src/ILVerify/README.md @@ -17,7 +17,7 @@ Historically on Full Framework IL generators used PEVerify to make sure that the - Fast spin up/tear down. ## The codebase -The project targets netcoreapp2.0 and uses the new .csproj based project format. If you want to open and compile it with Visual Studio then you need a version, which supports .NET Core 2.0 tooling. This is supported in Visual Studio 2017 Update 3 (Version 15.3) or later. The other option is to use command (with .NET Core 2.0 tooling). +The project targets netcoreapp2.1 and uses the new .csproj based project format. If you want to open and compile it with Visual Studio then you need a version, which supports .NET Core 2.1 tooling. This is supported in Visual Studio 2017 Version 15.8 or later. The other option is to use command (with .NET Core 2.1 tooling). The code is split into three projects: - ILVerification is the library with the core verification logic, - ILVerification.Tests contains the tests for ILVerification, diff --git a/src/ILVerify/netcoreapp/ILVerify.csproj b/src/ILVerify/netcoreapp/ILVerify.csproj index 47b7d3145..302e01f7d 100644 --- a/src/ILVerify/netcoreapp/ILVerify.csproj +++ b/src/ILVerify/netcoreapp/ILVerify.csproj @@ -2,7 +2,7 @@ <PropertyGroup> <OutputType>Exe</OutputType> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> diff --git a/src/ILVerify/src/ILVerify.csproj b/src/ILVerify/src/ILVerify.csproj index 7023512db..9042c8a85 100644 --- a/src/ILVerify/src/ILVerify.csproj +++ b/src/ILVerify/src/ILVerify.csproj @@ -10,7 +10,7 @@ <SkipSigning>true</SkipSigning> <!-- Delete once we pick up fix for https://github.com/dotnet/roslyn/issues/8210 --> <DelaySign Condition="'$(OS)' != 'Windows_NT'">true</DelaySign> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <CopyNugetImplementations>false</CopyNugetImplementations> <!-- Force .dll extension even if output type is exe. --> <TargetExt>.dll</TargetExt> diff --git a/src/System.Private.CoreLib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs b/src/System.Private.CoreLib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs index e7efa22b2..b9abb357a 100644 --- a/src/System.Private.CoreLib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs +++ b/src/System.Private.CoreLib/shared/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs @@ -10,7 +10,7 @@ namespace System.Collections.Generic // We use NonRandomizedStringEqualityComparer as default comparer as it doesnt use the randomized string hashing which // keeps the performance not affected till we hit collision threshold and then we switch to the comparer which is using // randomized string hashing. - [Serializable] // Required for compatibility with .NET Core 2.0 as we exposed the NonRandomizedStringEqualityComparer inside the serialization blob + [Serializable] // Required for compatibility with .NET Core 2.1 as we exposed the NonRandomizedStringEqualityComparer inside the serialization blob // Needs to be public to support binary serialization compatibility public sealed class NonRandomizedStringEqualityComparer : EqualityComparer<string>, ISerializable { diff --git a/tests/CoreCLR/runtest/publishdependency.targets b/tests/CoreCLR/runtest/publishdependency.targets index 4aee8d8fd..90cb1697a 100644 --- a/tests/CoreCLR/runtest/publishdependency.targets +++ b/tests/CoreCLR/runtest/publishdependency.targets @@ -2,8 +2,8 @@ <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> <ItemGroup> - <TestTargetFramework Include=".NETCoreApp,Version=v1.0"> - <Folder>netcoreapp1.0</Folder> + <TestTargetFramework Include=".NETCoreApp,Version=v2.2"> + <Folder>netcoreapp2.1</Folder> </TestTargetFramework> </ItemGroup> <!-- diff --git a/tests/CoreCLR/runtest/src/dir.props b/tests/CoreCLR/runtest/src/dir.props index 5a67e6a83..0eb64a80e 100644 --- a/tests/CoreCLR/runtest/src/dir.props +++ b/tests/CoreCLR/runtest/src/dir.props @@ -69,8 +69,8 @@ <!-- Default Test platform to deploy the netstandard compiled tests to --> <PropertyGroup> - <!-- we default TestTFM and FilterToTestTFM to netcoreapp1.0 if they are not explicity defined --> - <DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp1.0</DefaultTestTFM> + <!-- we default TestTFM and FilterToTestTFM to netcoreapp2.1 if they are not explicity defined --> + <DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp2.1</DefaultTestTFM> <TestTFM Condition="'$(TestTFM)'==''">$(DefaultTestTFM)</TestTFM> <FilterToTestTFM Condition="'$(FilterToTestTFM)'==''">$(DefaultTestTFM)</FilterToTestTFM> </PropertyGroup> diff --git a/tests/CoreFX/runtest/CoreFXTestHarness/Test.csproj b/tests/CoreFX/runtest/CoreFXTestHarness/Test.csproj index 472252437..8d83f8eed 100644 --- a/tests/CoreFX/runtest/CoreFXTestHarness/Test.csproj +++ b/tests/CoreFX/runtest/CoreFXTestHarness/Test.csproj @@ -12,7 +12,7 @@ <PropertyGroup> <ToolsDir>$(FrameworkLibPath)\..\tools\</ToolsDir> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <!-- Don't warn if some dependencies were rolled forward --> <NoWarn>$(NoWarn);NU1603</NoWarn> </PropertyGroup> diff --git a/tests/CoreFX/runtest/src/TestUtils/TestFileSetup/CoreFX.TestUtils.TestFileSetup.csproj b/tests/CoreFX/runtest/src/TestUtils/TestFileSetup/CoreFX.TestUtils.TestFileSetup.csproj index 6332bc90a..eb7413ef3 100644 --- a/tests/CoreFX/runtest/src/TestUtils/TestFileSetup/CoreFX.TestUtils.TestFileSetup.csproj +++ b/tests/CoreFX/runtest/src/TestUtils/TestFileSetup/CoreFX.TestUtils.TestFileSetup.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\..\..\dir.props" /> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <OutputType>Exe</OutputType> </PropertyGroup> <ItemGroup> diff --git a/tests/CoreFX/runtest/src/TestUtils/XUnit/CoreFX.TestUtils.XUnit.csproj b/tests/CoreFX/runtest/src/TestUtils/XUnit/CoreFX.TestUtils.XUnit.csproj index 3653a4814..9b3312769 100644 --- a/tests/CoreFX/runtest/src/TestUtils/XUnit/CoreFX.TestUtils.XUnit.csproj +++ b/tests/CoreFX/runtest/src/TestUtils/XUnit/CoreFX.TestUtils.XUnit.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <Import Project="..\..\..\dir.props" /> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> <OutputType>Exe</OutputType> </PropertyGroup> <ItemGroup> diff --git a/tests/src/Simple/SimpleTest.targets b/tests/src/Simple/SimpleTest.targets index aae948971..9a018e7eb 100644 --- a/tests/src/Simple/SimpleTest.targets +++ b/tests/src/Simple/SimpleTest.targets @@ -13,7 +13,7 @@ <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> - <TargetFramework>netcoreapp2.0</TargetFramework> + <TargetFramework>netcoreapp2.1</TargetFramework> </PropertyGroup> <ItemGroup> |