diff options
35 files changed, 90 insertions, 105 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 024b92eee1..58e3043716 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -3.0.0-preview1-03617-02 +3.0.0-preview1-03713-01 diff --git a/UpdatePublishedVersions.ps1 b/UpdatePublishedVersions.ps1 index d5724c930d..468f9eaa48 100644 --- a/UpdatePublishedVersions.ps1 +++ b/UpdatePublishedVersions.ps1 @@ -16,8 +16,8 @@ param( # A pattern matching all packages in the set that the versions repository should be set to. [Parameter(Mandatory=$true)][string]$nupkgPath) -& "$PSScriptRoot\msbuild.cmd" /nologo /verbosity:minimal /clp:Summary /nodeReuse:false ` - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log ` +& "$PSScriptRoot\dotnet.cmd" msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false ` + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log ` /p:RestoreDefaultOptimizationDataPackage=false ` /p:PortableBuild=true ` /p:UsePartialNGENOptimization=false ` diff --git a/build-packages.cmd b/build-packages.cmd index 05af916a13..f823421858 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -33,9 +33,9 @@ if [!processedArgs!]==[] ( :ArgsDone -call %__ProjectDir%/msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ +call %__ProjectDir%/dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ /p:__BuildOS=Windows_NT /flp:v=detailed;Append;LogFile=build-packages.log^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:PortableBuild=true %__ProjectDir%\src\.nuget\packages.builds^ /p:FilterToOSGroup=Windows_NT %__MSBuildArgs% %unprocessedArgs% if NOT [!ERRORLEVEL!]==[0] ( diff --git a/build-packages.sh b/build-packages.sh index aba1fcc267..1c36dfb4f3 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -149,7 +149,7 @@ $__ProjectRoot/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \ /p:__BuildOS=$__BuildOS /flp:v=detailed\;Append\;LogFile=build-packages.log \ /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ /p:PortableBuild=true src/.nuget/packages.builds \ - /p:__DistroRid=$__DistroRid /p:UseSharedCompilation=false /p:BuildNugetPackage=false \ + /p:__DistroRid=$__DistroRid /p:BuildNugetPackage=false \ $buildArgs $unprocessedBuildArgs if [ $? -ne 0 ] then diff --git a/build-test.cmd b/build-test.cmd index 53b2fe7ab5..5c48a0230d 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -179,11 +179,6 @@ call "%__ProjectDir%\init-tools.cmd" @if defined _echo @echo on set "__ToolsDir=%__ProjectDir%\Tools" -set "DotNetCli=%__ToolsDir%\dotnetcli\dotnet.exe" -if not exist "%DotNetCli%" ( - echo %__MsgPrefix%"%DotNetCli%" not found after init-tools. - exit /b 1 -) REM ========================================================================================= REM === @@ -277,8 +272,8 @@ set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! -call "%__ProjectDir%\msbuild.cmd" /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call "%__ProjectDir%\dotnet.cmd" msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\tests\build.proj /t:BatchRestorePackages^ @@ -297,8 +292,8 @@ set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! -call "%__ProjectDir%\msbuild.cmd" /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call "%__ProjectDir%\dotnet.cmd" msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__Projectdir%\tests\runtest.proj /t:BinPlaceRef /t:BinPlaceProduct /t:CopyCrossgenToProduct /p:RuntimeId="%__RuntimeId%"^ @@ -353,7 +348,7 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set TestBuildSlice=%%G echo Running: msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %TargetsWindowsMsbuildArg% %__msbuildArgs% %__BuildAgainstPackagesArg% !__PriorityArg! %__UnprocessedBuildArgs% - call msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %TargetsWindowsMsbuildArg% %__msbuildArgs% %__BuildAgainstPackagesArg% !__PriorityArg! %__UnprocessedBuildArgs% + call "%__ProjectDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %TargetsWindowsMsbuildArg% %__msbuildArgs% %__BuildAgainstPackagesArg% !__PriorityArg! %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: @@ -374,8 +369,8 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( REM Check that we've built about as many tests as we expect. This is primarily intended to prevent accidental changes that cause us to build REM drastically fewer Pri-1 tests than expected. echo %__MsgPrefix%Check the managed tests build -echo Running: msbuild %__ProjectDir%\tests\runtest.proj /t:CheckTestBuild /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% -call msbuild %__ProjectDir%\tests\runtest.proj /t:CheckTestBuild /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% +echo Running: dotnet msbuild %__ProjectDir%\tests\runtest.proj /t:CheckTestBuild /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% +call "%__ProjectDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\runtest.proj /t:CheckTestBuild /p:CLRTestPriorityToBuild=%__Priority% %__msbuildArgs% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. exit /b 1 @@ -438,8 +433,8 @@ set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! -call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\tests\runtest.proj /t:CreateTestOverlay^ @@ -472,8 +467,8 @@ set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! -call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\tests\runtest.proj /t:CreateTestHost^ @@ -506,7 +501,7 @@ set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! REM Build wrappers using the local SDK's msbuild. As we move to arcade, the other builds should be moved away from run.exe as well. -call %DotNetCli% msbuild %__ProjectDir%\tests\runtest.proj /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/ /p:BuildWrappers=true !__Logging! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__BuildAgainstPackagesArg% %__UnprocessedBuildArgs% +call "%__ProjectDir%\dotnet.cmd" msbuild %__ProjectDir%\tests\runtest.proj /p:RestoreAdditionalProjectSources=https://dotnet.myget.org/F/dotnet-core/ /p:BuildWrappers=true !__Logging! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__BuildAgainstPackagesArg% %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: Xunit wrapper build failed. Refer to the build log files for details: echo %__BuildLog% @@ -557,8 +552,8 @@ set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%" set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%" set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! -call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\tests\helixprep.proj^ @@ -367,8 +367,8 @@ REM ============================================================================ @if defined _echo @echo on -call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ +call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\build.proj /t:GenerateVersionHeader /p:GenerateVersionHeader=true /p:NativeVersionHeaderFile="%__RootBinDir%\obj\_version.h"^ @@ -382,7 +382,7 @@ REM ============================================================================ if %__RestoreOptData% EQU 1 ( echo %__MsgPrefix%Restoring the OptimizationData Package - call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ ./build.proj /t:RestoreOptData^ @@ -394,16 +394,11 @@ if %__RestoreOptData% EQU 1 ( ) REM Parse the optdata package versions out of msbuild so that we can pass them on to CMake -set DotNetCli=%__ProjectDir%\Tools\dotnetcli\dotnet.exe -if not exist "%DotNetCli%" ( - echo %__MsgPrefix%Error: "%DotNetCli%" not found - exit /b 1 -) set OptDataProjectFilePath=%__ProjectDir%\src\.nuget\optdata\optdata.csproj -for /f "tokens=*" %%s in ('%DotNetCli% msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do ( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpPgoDataPackageVersion /nologo') do ( set __PgoOptDataVersion=%%s ) -for /f "tokens=*" %%s in ('%DotNetCli% msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do ( +for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "%OptDataProjectFilePath%" /t:DumpIbcDataPackageVersion /nologo') do ( set __IbcOptDataVersion=%%s ) @@ -655,8 +650,8 @@ if %__BuildCoreLib% EQU 1 ( set __MsbuildErr=/flp2:ErrorsOnly;LogFile=!__BuildErr! set __Logging=!__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! - call %__ProjectDir%\msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ - /l:BinClashLogger,Tools/net46/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ + call %__ProjectDir%\dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false^ + /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log^ /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true^ /p:UsePartialNGENOptimization=false /maxcpucount^ %__ProjectDir%\build.proj^ @@ -673,7 +668,7 @@ if %__BuildCoreLib% EQU 1 ( if %__IbcOptimize% EQU 1 ( echo %__MsgPrefix%Commencing IBCMerge of System.Private.CoreLib for %__BuildOS%.%__BuildArch%.%__BuildType% set IbcMergeProjectFilePath=%__ProjectDir%\src\.nuget\optdata\ibcmerge.csproj - for /f "tokens=*" %%s in ('%DotNetCli% msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @( + for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @( set __IbcMergeVersion=%%s ) @@ -488,7 +488,7 @@ build_CoreLib() /p:UsePartialNGENOptimization=false /maxcpucount \ $__ProjectDir/build.proj \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackage=false \ $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then @@ -552,7 +552,7 @@ generate_NugetPackages() /p:UsePartialNGENOptimization=false /maxcpucount \ $__SourceDir/.nuget/packages.builds \ /flp:Verbosity=normal\;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackages=false /p:UseSharedCompilation=false /p:__DoCrossArchBuild=$__CrossBuild \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackages=false /p:__DoCrossArchBuild=$__CrossBuild \ $__CommonMSBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then @@ -30,7 +30,7 @@ if [%1]==[] set __args=/t:CleanAllProjects if [%1]==[-b] set __args=/t:CleanAllProjects if [%1]==[-p] set __args=/t:CleanPackages if [%1]==[-c] set __args=/t:CleanPackagesCache -call %~dp0msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /flp:v=normal;LogFile=clean.log %__args% +call %~dp0dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /flp:v=normal;LogFile=clean.log %__args% exit /b %ERRORLEVEL% :Usage @@ -44,4 +44,4 @@ echo -c - Deletes the user-local NuGet package cache. echo -all - Cleans repository and restores it to pristine state. echo. echo ^If no option is specified then "clean -b" is implied. -exit /b
\ No newline at end of file +exit /b diff --git a/dependencies.props b/dependencies.props index 5b6694703e..4c5af00440 100644 --- a/dependencies.props +++ b/dependencies.props @@ -26,7 +26,7 @@ <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> <CoreClrCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</CoreClrCurrentRef> - <BuildToolsCurrentRef>f31086500dc58cefe7b1275300f6fc07b38c1bcc</BuildToolsCurrentRef> + <BuildToolsCurrentRef>caae3bdca7852cd19b259bdc9749ccdcea9fe761</BuildToolsCurrentRef> <PgoDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</PgoDataCurrentRef> <IbcDataCurrentRef>7fb04b947ac4fde6e33a57474c5c4a07ef90a185</IbcDataCurrentRef> </PropertyGroup> @@ -51,7 +51,7 @@ <!-- Package versions used as toolsets --> <PropertyGroup> <FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage> - <FeedTasksPackageVersion>3.0.0-preview1-03617-02</FeedTasksPackageVersion> + <FeedTasksPackageVersion>3.0.0-preview1-03713-01</FeedTasksPackageVersion> </PropertyGroup> <!-- Publish symbol build task package --> @@ -4,6 +4,11 @@ <Import Project="dir.common.props" /> + <PropertyGroup> + <LangVersion>8.0</LangVersion> + <UseSharedCompilation>true</UseSharedCompilation> + </PropertyGroup> + <!-- $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix. --> @@ -24,19 +29,13 @@ <MinorVersion>6</MinorVersion> </PropertyGroup> - <!-- Build Tools Versions --> - <PropertyGroup> - <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> - <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> - </PropertyGroup> - <!-- Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer as well as running the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. --> <PropertyGroup> <RunningOnCore>false</RunningOnCore> - <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore> + <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'core'">true</RunningOnCore> <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop> <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop> <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45> @@ -145,10 +144,10 @@ <ProjectUrl>https://dot.net</ProjectUrl> - <!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires + <!-- On Windows, MSbuild can still run against Desktop FX while it runs on .NET Core on non-Windows. this requires pulling in different packaging dependencies. --> - <PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net46/</PackagingTaskDir> + <PackagingTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(ToolsDir)net46/</PackagingTaskDir> <!-- defined in buildtools packaging.targets, but we need this before targets are imported --> <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform> <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform> @@ -187,6 +186,5 @@ </ItemGroup> <!-- Use Roslyn Compilers to build --> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false' and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> - <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)') and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> + <Import Project="$(RoslynPropsFile)" /> </Project> diff --git a/dotnet.cmd b/dotnet.cmd new file mode 100644 index 0000000000..352444a6fc --- /dev/null +++ b/dotnet.cmd @@ -0,0 +1,30 @@ +@if not defined _echo @echo off +setlocal + +set "__ProjectDir=%~dp0" + +call "%__ProjectDir%"\setup_vs_tools.cmd + +REM setup_vs_tools.cmd will correctly echo error message. +if NOT '%ERRORLEVEL%' == '0' exit /b 1 + +:: Clear the 'Platform' env variable for this session, as it's a per-project setting within the build, and +:: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (issue: #69). +set Platform= +set __ProjectDir= + +:: Restore the Tools directory +call %~dp0init-tools.cmd +if NOT [%ERRORLEVEL%]==[0] ( + exit /b 1 +) + +pushd %~dp0 +echo Running: dotnet %* +call "%~dp0\Tools\dotnetcli\dotnet.exe" %* +popd +if NOT [%ERRORLEVEL%]==[0] ( + exit /b 1 +) + +exit /b 0 diff --git a/publish-packages.cmd b/publish-packages.cmd index 79adbe93da..1dd7eaa0eb 100644 --- a/publish-packages.cmd +++ b/publish-packages.cmd @@ -35,7 +35,7 @@ FOR /f "tokens=1*" %%x IN ("%*") DO ( :ArgsDone -call %~dp0msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /p:__BuildOS=Windows_NT^ +call %~dp0dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /p:__BuildOS=Windows_NT^ .\src\publish.proj^ /flp:v=detailed;LogFile=publish-packages.log /clp:v=detailed %__MSBuildArgs% @exit /b %ERRORLEVEL% @@ -57,4 +57,4 @@ echo To specify the name of the container to publish into, use the following pro echo -Container="container name" echo Architecture can be x64, x86, arm, or arm64 echo Configuration can be Release, Debug, or Checked -exit /b
\ No newline at end of file +exit /b diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 831c38c8e6..a4c2a448d0 100644 --- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -35,7 +35,6 @@ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation</_TargetFrameworkDirectories> <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths> <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes> - <LangVersion>latest</LangVersion> <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile> </PropertyGroup> <!-- Add Serviceable attribute to the project's metadata --> diff --git a/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj b/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj index 73099f4114..5635c9dce4 100644 --- a/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj +++ b/src/System.Private.CoreLib/Tools/GenUnicodeProp/GenUnicodeProp.csproj @@ -3,7 +3,6 @@ <PropertyGroup> <OutputType>Exe</OutputType> <TargetFramework>netcoreapp3.0</TargetFramework> - <LangVersion>7.3</LangVersion> </PropertyGroup> </Project> @@ -40,7 +40,7 @@ FOR /f "tokens=1*" %%x IN ("%*") DO ( :ArgsDone -@call %~dp0msbuild.cmd /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /flp:v=detailed;LogFile=sync.log %__MSBuildArgs% +@call %~dp0dotnet.cmd msbuild /nologo /verbosity:minimal /clp:Summary /nodeReuse:false /flp:v=detailed;LogFile=sync.log %__MSBuildArgs% @exit /b %ERRORLEVEL% :Usage @@ -67,4 +67,4 @@ echo -RuntimeId="RID" (Needs to match what's in the container) echo. echo. echo. -echo If no option is specified then sync.cmd -p is implied.
\ No newline at end of file +echo If no option is specified then sync.cmd -p is implied. diff --git a/tests/dir.props b/tests/dir.props index 2266e4eec2..393de20ab9 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -9,11 +9,10 @@ </PropertyGroup> <Import Project="dir.sdkbuild.props" Condition="'$(UsingMicrosoftNETSdk)' == 'true'" /> - - <!-- Build Tools Versions --> + <PropertyGroup> - <RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion> - <RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName> + <LangVersion>8.0</LangVersion> + <UseSharedCompilation>true</UseSharedCompilation> </PropertyGroup> <!-- @@ -30,7 +29,7 @@ --> <PropertyGroup> <RunningOnCore>false</RunningOnCore> - <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'Core'">true</RunningOnCore> + <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'core'">true</RunningOnCore> <BuildToolsTargetsDesktop>false</BuildToolsTargetsDesktop> <BuildToolsTargetsDesktop Condition="'$(RunningOnCore)' != 'true'">true</BuildToolsTargetsDesktop> <BuildToolsTargets45>$(BuildToolsTargetsDesktop)</BuildToolsTargets45> @@ -109,7 +108,7 @@ </PropertyGroup> <!-- Use Roslyn Compilers to build --> - <Import Project="$(RoslynPropsFile)" Condition="Exists('$(RoslynPropsFile)') and '$(RoslynIncompatibleMsbuildVersion)' != 'true'" /> + <Import Project="$(RoslynPropsFile)" /> <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> <!-- When we do a traversal build we get all packages up front, don't restore them again --> diff --git a/tests/runtest.cmd b/tests/runtest.cmd index a31ee475b9..b5036f579b 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -35,6 +35,8 @@ set "__ProjectFilesDir=%__ProjectDir%" set "__RootBinDir=%__ProjectDir%\..\bin" set "__LogsDir=%__RootBinDir%\Logs" set "__MsbuildDebugLogsDir=%__LogsDir%\MsbuildDebugLogs" +set __ToolsDir=%__ProjectDir%\..\Tools +set "DotNetCli=%__ToolsDir%\dotnetcli\dotnet.exe" set __Sequential= set __msbuildExtraArgs= @@ -241,17 +243,12 @@ exit /b %ERRORLEVEL% :: Set up msbuild and tools environment. Check if msbuild and VS exist. -set _msbuildexe= if /i "%__VSVersion%" == "vs2019" ( set "__VSToolsRoot=%VS160COMNTOOLS%" set "__VCToolsRoot=%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build" - - set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" ) else if /i "%__VSVersion%" == "vs2017" ( set "__VSToolsRoot=%VS150COMNTOOLS%" set "__VCToolsRoot=%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build" - - set _msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" ) :: Does VS really exist? @@ -259,12 +256,6 @@ if not exist "%__VSToolsRoot%\..\IDE\devenv.exe" goto NoVS if not exist "%__VCToolsRoot%\vcvarsall.bat" goto NoVS if not exist "%__VSToolsRoot%\VsDevCmd.bat" goto NoVS -:: Does MSBuild really exist? -if not exist %_msbuildexe% ( - echo %__MsgPrefix%Error: Could not find MSBuild.exe. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. - exit /b 1 -) - if not defined VSINSTALLDIR ( echo %__MsgPrefix%Error: runtest.cmd should be run from a Visual Studio Command Prompt. Please see https://github.com/dotnet/coreclr/blob/master/Documentation/project-docs/developer-guide.md for build instructions. exit /b 1 @@ -426,8 +417,6 @@ REM ============================================================================ :RunCoreFXTests set _CoreFXTestHost=%XunitTestBinBase%\testhost -set __ToolsDir=%__ProjectDir%\..\Tools -set "DotNetCli=%__ToolsDir%\dotnetcli\dotnet.exe" set _RootCoreFXTestPath=%__TestWorkingDir%\CoreFX set _CoreFXTestUtilitiesOutputPath=%_RootCoreFXTestPath%\CoreFXTestUtilities @@ -591,10 +580,10 @@ set __msbuildLogArgs=^ set __msbuildArgs=%* %__msbuildCommonArgs% %__msbuildLogArgs% @REM The next line will overwrite the existing log file, if any. -echo %__MsgPrefix%%_msbuildexe% %__msbuildArgs% -echo Invoking: %_msbuildexe% %__msbuildArgs% > "%__BuildLog%" +echo %__MsgPrefix%"%DotNetCli%" msbuild %__msbuildArgs% +echo Invoking: "%DotNetCli%" msbuild %__msbuildArgs% > "%__BuildLog%" -%_msbuildexe% %__msbuildArgs% +call "%DotNetCli%" msbuild %__msbuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: msbuild failed. Refer to the log files for details: echo %__BuildLog% @@ -687,14 +676,14 @@ echo %__MsgPrefix%Created the Test Host layout with all dependencies in %_CoreFX REM Publish and call the CoreFX test helper projects - should this be integrated into runtest.proj? REM Build Helper project -set NEXTCMD="%DotNetCli%" msbuild /t:Restore "%_CoreFXTestSetupUtility%" +set NEXTCMD=call :msbuild /t:Restore "%_CoreFXTestSetupUtility%" echo !NEXTCMD! !NEXTCMD! if errorlevel 1 ( exit /b 1 ) -set NEXTCMD=call "%DotNetCli%" msbuild "/p:Configuration=%CoreRT_BuildType%" "/p:OSGroup=%CoreRT_BuildOS%" "/p:Platform=%CoreRT_BuildArch%" "/p:OutputPath=%_CoreFXTestUtilitiesOutputPath%" "%_CoreFXTestSetupUtility%" +set NEXTCMD=call :msbuild "/p:Configuration=%CoreRT_BuildType%" "/p:OSGroup=%CoreRT_BuildOS%" "/p:Platform=%CoreRT_BuildArch%" "/p:OutputPath=%_CoreFXTestUtilitiesOutputPath%" "%_CoreFXTestSetupUtility%" echo !NEXTCMD! !NEXTCMD! if errorlevel 1 ( diff --git a/tests/src/CoreMangLib/system/span/RefStructWithSpan.csproj b/tests/src/CoreMangLib/system/span/RefStructWithSpan.csproj index 40ad0645bd..7c56c67be9 100644 --- a/tests/src/CoreMangLib/system/span/RefStructWithSpan.csproj +++ b/tests/src/CoreMangLib/system/span/RefStructWithSpan.csproj @@ -9,7 +9,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>1</CLRTestPriority> diff --git a/tests/src/CoreMangLib/system/span/SlowTailCallArgs.csproj b/tests/src/CoreMangLib/system/span/SlowTailCallArgs.csproj index 8acdab76c2..6afa0ee0e6 100644 --- a/tests/src/CoreMangLib/system/span/SlowTailCallArgs.csproj +++ b/tests/src/CoreMangLib/system/span/SlowTailCallArgs.csproj @@ -9,7 +9,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLRTestKind>BuildAndRun</CLRTestKind> <CLRTestPriority>1</CLRTestPriority> diff --git a/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj b/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj index f83106e248..2866310fd2 100644 --- a/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj +++ b/tests/src/Interop/PInvoke/ArrayWithOffset/ArrayWithOffsetTest.csproj @@ -13,7 +13,6 @@ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <DefineConstants>$(DefineConstants);STATIC</DefineConstants> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <LangVersion>latest</LangVersion> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"></PropertyGroup> diff --git a/tests/src/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj b/tests/src/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj index b25553e5f8..9d749c5c5b 100644 --- a/tests/src/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj +++ b/tests/src/JIT/Directed/StructPromote/Unsafe/AccessInvalidFieldOffset.csproj @@ -10,7 +10,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> diff --git a/tests/src/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj b/tests/src/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj index b25553e5f8..9d749c5c5b 100644 --- a/tests/src/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj +++ b/tests/src/JIT/Directed/StructPromote/Unsafe/ReadDoubleFromIntOffset.csproj @@ -10,7 +10,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> diff --git a/tests/src/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj b/tests/src/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj index b25553e5f8..9d749c5c5b 100644 --- a/tests/src/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj +++ b/tests/src/JIT/Directed/StructPromote/Unsafe/ReadStructAsAnotherType.csproj @@ -10,7 +10,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> diff --git a/tests/src/JIT/HardwareIntrinsics/X86/Sse2/dir.props b/tests/src/JIT/HardwareIntrinsics/X86/Sse2/dir.props index c2cc1356db..b663c72888 100644 --- a/tests/src/JIT/HardwareIntrinsics/X86/Sse2/dir.props +++ b/tests/src/JIT/HardwareIntrinsics/X86/Sse2/dir.props @@ -1,6 +1,5 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Condition="Exists('..\dir.props')" Project="..\dir.props"/> <PropertyGroup> - <LangVersion>latest</LangVersion> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj index ad67828b47..c8d6b54a5e 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/Indexer.csproj @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Always try to use latest Roslyn compiler --> - <Import Project="$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="Exists('$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props')" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> diff --git a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj index 27581abd31..16649c889f 100644 --- a/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj +++ b/tests/src/JIT/Performance/CodeQuality/Span/SpanBench.csproj @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Always try to use latest Roslyn compiler --> - <Import Project="$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props" Condition="Exists('$(ToolsDir)net46\roslyn\build\Microsoft.Net.Compilers.props')" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> diff --git a/tests/src/JIT/Regression/JitBlue/DevDiv_736188/DevDiv_736188.csproj b/tests/src/JIT/Regression/JitBlue/DevDiv_736188/DevDiv_736188.csproj index 9bfa92ae61..5666642db8 100644 --- a/tests/src/JIT/Regression/JitBlue/DevDiv_736188/DevDiv_736188.csproj +++ b/tests/src/JIT/Regression/JitBlue/DevDiv_736188/DevDiv_736188.csproj @@ -9,8 +9,6 @@ <OutputType>Exe</OutputType> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <LangVersion>latest</LangVersion> - </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_21915/Github_21915.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_21915/Github_21915.csproj index c46f1c3549..42f8a01f39 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_21915/Github_21915.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_21915/Github_21915.csproj @@ -14,7 +14,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> <PropertyGroup> - <LangVersion>latest</LangVersion> <DebugType>None</DebugType> <Optimize>True</Optimize> </PropertyGroup> diff --git a/tests/src/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj b/tests/src/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj index c46f1c3549..42f8a01f39 100644 --- a/tests/src/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj +++ b/tests/src/JIT/Regression/JitBlue/GitHub_21990/GitHub_21990.csproj @@ -14,7 +14,6 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "></PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "></PropertyGroup> <PropertyGroup> - <LangVersion>latest</LangVersion> <DebugType>None</DebugType> <Optimize>True</Optimize> </PropertyGroup> diff --git a/tests/src/JIT/opt/Devirtualization/box2.csproj b/tests/src/JIT/opt/Devirtualization/box2.csproj index e821b3bca9..efc30347f1 100644 --- a/tests/src/JIT/opt/Devirtualization/box2.csproj +++ b/tests/src/JIT/opt/Devirtualization/box2.csproj @@ -20,7 +20,6 @@ </CodeAnalysisDependentAssemblyPaths> </ItemGroup> <PropertyGroup> - <Langversion>7.2</Langversion> <DebugType>None</DebugType> <Optimize>True</Optimize> </PropertyGroup> @@ -32,4 +31,4 @@ </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "></PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/baseservices/TieredCompilation/TieredVtableMethodTests.csproj b/tests/src/baseservices/TieredCompilation/TieredVtableMethodTests.csproj index 5c64a51cd6..dc65a66b04 100644 --- a/tests/src/baseservices/TieredCompilation/TieredVtableMethodTests.csproj +++ b/tests/src/baseservices/TieredCompilation/TieredVtableMethodTests.csproj @@ -6,7 +6,6 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{DF8B8A76-BC07-4A5F-BD74-1B5D79B94E92}</ProjectGuid> <OutputType>Exe</OutputType> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLRTestPriority>0</CLRTestPriority> </PropertyGroup> diff --git a/tests/src/baseservices/exceptions/stacktrace/Tier1StackTrace.csproj b/tests/src/baseservices/exceptions/stacktrace/Tier1StackTrace.csproj index 04b7663073..818a17b569 100644 --- a/tests/src/baseservices/exceptions/stacktrace/Tier1StackTrace.csproj +++ b/tests/src/baseservices/exceptions/stacktrace/Tier1StackTrace.csproj @@ -6,7 +6,6 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{8758BFAC-7D36-4244-8A36-4C464C0AFA6D}</ProjectGuid> <OutputType>Exe</OutputType> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <CLRTestPriority>1</CLRTestPriority> diff --git a/tests/src/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj b/tests/src/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj index 9ed0f8f712..c59c217f9e 100644 --- a/tests/src/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj +++ b/tests/src/readytorun/DynamicMethodGCStress/DynamicMethodGCStress.csproj @@ -6,7 +6,6 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{8884AF49-72DA-44EC-B3E0-9FC8F9BCC1F9}</ProjectGuid> <OutputType>Exe</OutputType> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <Optimize>true</Optimize> <!-- This test has a secondary thread with an infinite loop --> diff --git a/tests/src/reflection/SetValue/TrySetReadonlyStaticField.csproj b/tests/src/reflection/SetValue/TrySetReadonlyStaticField.csproj index d7d18999cf..f0fff6abdc 100644 --- a/tests/src/reflection/SetValue/TrySetReadonlyStaticField.csproj +++ b/tests/src/reflection/SetValue/TrySetReadonlyStaticField.csproj @@ -6,7 +6,6 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{58DB4A46-51BE-46A1-AEA1-0C32FBAF5562}</ProjectGuid> <OutputType>Exe</OutputType> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> diff --git a/tests/src/reflection/Tier1Collectible/Tier1Collectible.csproj b/tests/src/reflection/Tier1Collectible/Tier1Collectible.csproj index f77c7cff63..fcc11bf828 100644 --- a/tests/src/reflection/Tier1Collectible/Tier1Collectible.csproj +++ b/tests/src/reflection/Tier1Collectible/Tier1Collectible.csproj @@ -6,7 +6,6 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProjectGuid>{58DB4A46-51BE-46A1-AEA1-0C32FBAF5562}</ProjectGuid> <OutputType>Exe</OutputType> - <LangVersion>latest</LangVersion> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLRTestPriority>1</CLRTestPriority> </PropertyGroup> |