diff options
127 files changed, 1016 insertions, 2087 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 0cd317f7f..a72a2229e 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01322-01 +2.0.0-prerelease-01702-02 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 2b920384e..066d1923b 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 @@ -41,15 +41,15 @@ You should now be able to use the `dotnet` commands of the CLI tools. </PropertyGroup> <Import Project="$(MSBuildSDKsPath)\Microsoft.NET.Sdk\Sdk\Sdk.targets" /> - <Import Project="$(IlcPath)\Microsoft.NETCore.Native.targets" /> + <Import Project="$(IlcPath)\build\Microsoft.NETCore.Native.targets" /> </Project> ``` -* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug\packaging\publish1` argument to all dotnet commands below. +* Set IlcPath environment variable to point to the built binaries. Alternatively, pass an extra `/p:IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug` argument to all dotnet commands below. - * Unix: `export IlcPath=<repo_root>/bin/Product/Linux.x64.Debug/packaging/publish1` + * Unix: `export IlcPath=<repo_root>/bin/Product/Linux.x64.Debug` - * Windows: `set IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug\packaging\publish1` + * Windows: `set IlcPath=<repo_root>\bin\Product\Windows_NT.x64.Debug` * Run `dotnet restore`. This will download nuget packages required for compilation. diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 7a77ed32a..170f3fc4f 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0-preview3-003223 +2.0.0-preview1-005977 diff --git a/src/NuGet.config b/NuGet.config index 935e6edd8..57feb087b 100644 --- a/src/NuGet.config +++ b/NuGet.config @@ -1,21 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> - <!-- NOTE: Leave this file here and keep it in sync with list in dir.props. --> - <!-- The command-line doesn't need it, but the IDE does. --> <packageSources> <clear/> <add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" /> <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> <add key="myget.org dotnet-corefxlab" value="https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> - <add key="myget.org dotnet-corert" value="https://dotnet.myget.org/F/dotnet-corert/api/v3/index.json" /> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> </packageSources> <config> - <add key="repositoryPath" value="..\packages" /> + <add key="repositoryPath" value="packages" /> </config> <packageRestore> <!-- Automated package restore in VS does not work at this time with this project and it causes build failures in VS. Disable it. --> <add key="automatic" value="false" /> </packageRestore> + <!-- Don't use any higher level config files. + Our builds need to be isolated from user/machine state --> + <fallbackPackageFolders> + <clear /> + </fallbackPackageFolders> </configuration> @@ -36,6 +36,14 @@ exit /b %ERRORLEVEL% :AfterNativeBuild +call %~dp0buildscripts\build-restore.cmd %* + +IF NOT ERRORLEVEL 1 goto AfterRestoreBuild +echo Managed component build failed. Refer !__BuildLog! for details. +exit /b %ERRORLEVEL% + +:AfterRestoreBuild + call %~dp0buildscripts\build-managed.cmd %* IF NOT ERRORLEVEL 1 goto AfterManagedBuild diff --git a/build.proj b/build.proj index 4acb412a8..7a7a11a32 100644 --- a/build.proj +++ b/build.proj @@ -1,20 +1,15 @@ <Project DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="dir.props" /> - <!-- The following properties are in place to keep the behavior of build.cmd while we work on the dev workflow steps. --> + <!-- required to build the projects in their specified order --> <PropertyGroup> - <!-- To disable the restoration of packages, set RestoreDuringBuild=false or pass /p:RestoreDuringBuild=false.--> - <RestoreDuringBuild Condition="'$(RestoreDuringBuild)'==''">true</RestoreDuringBuild> + <SerializeProjects>true</SerializeProjects> </PropertyGroup> - <PropertyGroup> - <GenerateCodeCoverageReportForAll>true</GenerateCodeCoverageReportForAll> - </PropertyGroup> - <Import Project="$(ToolsDir)CodeCoverage.targets" Condition="Exists('$(ToolsDir)CodeCoverage.targets')" /> - <Import Project="$(ToolsDir)PerfTesting.targets" Condition="Exists('$(ToolsDir)PerfTesting.targets') and '$(Performance)' == 'true'"/> <Import Project="$(ToolsDir)VersionTools.targets" Condition="Exists('$(ToolsDir)VersionTools.targets')" /> <ItemGroup> + <Project Include="src\Common\test-runtime\XUnit.Runtime.depproj" /> <Project Include="src\dirs.proj" /> </ItemGroup> @@ -22,32 +17,6 @@ <Import Project="dir.traversal.targets" /> - <PropertyGroup Condition="'$(RestoreDuringBuild)'=='true'"> - <TraversalBuildDependsOn> - BatchRestorePackages; - $(TraversalBuildDependsOn); - </TraversalBuildDependsOn> - </PropertyGroup> - - <Target Name="BatchRestorePackages"> - <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" /> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." /> - - <Exec Command="$(DnuRestoreCommand) @(DnuRestoreDir->'"%(Identity)"', ' ')" - StandardOutputImportance="Low" - CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" - ContinueOnError="ErrorAndContinue" /> - - <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." /> - </Target> - - <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> - <Target Name="RestorePackages" DependsOnTargets="BatchRestorePackages" /> - - <!-- Override clean from dir.traversal.targets and just remove the full BinDir unless build.[cmd|sh] has already done the cleaning --> - <Target Name="Clean"> - <RemoveDir Condition="'$(CleanedTheBuild)' != '1'" Directories="$(ObjDir)" /> - </Target> + <Import Project="$(ToolsDir)clean.targets" /> </Project> diff --git a/buildscripts/build-managed.cmd b/buildscripts/build-managed.cmd index 4a4307382..4a6f81417 100644 --- a/buildscripts/build-managed.cmd +++ b/buildscripts/build-managed.cmd @@ -30,9 +30,6 @@ exit /b %ERRORLEVEL% rem Explicitly set Platform causes conflicts in managed project files. Clear it to allow building from VS x64 Native Tools Command Prompt set Platform= -:: Restore the Tools directory -call "%__ProjectDir%\init-tools.cmd" - rem Tell nuget to always use repo-local nuget package cache. The "dotnet restore" invocations use the --packages rem argument, but there are a few commands in publish and tests that do not. set "NUGET_PACKAGES=%__PackagesDir%" @@ -45,7 +42,7 @@ dir /b "%__DotNetCliPath%\sdk" call "!VS%__VSProductVersion%COMNTOOLS!\VsDevCmd.bat" echo Commencing build of managed components for %__BuildOS%.%__BuildArch%.%__BuildType% echo. -%_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "%__ProjectDir%\build.proj" %__MSBCleanBuildArgs% %__ExtraMsBuildParams% /p:RepoPath="%__ProjectDir%" /p:RepoLocalBuild="true" /p:RelativeProductBinDir="%__RelativeProductBinDir%" /p:NuPkgRid=win7-x64 /p:ToolchainMilestone=%__ToolchainMilestone% /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" +%_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "%__ProjectDir%\build.proj" %__MSBCleanBuildArgs% %__ExtraMsBuildParams% /p:RepoPath="%__ProjectDir%" /p:RepoLocalBuild="true" /p:NuPkgRid=win7-x64 /nologo /maxcpucount /verbosity:minimal /nodeReuse:false /fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" IF NOT ERRORLEVEL 1 ( findstr /ir /c:".*Warning(s)" /c:".*Error(s)" /c:"Time Elapsed.*" "%__BuildLog%" goto AfterILCompilerBuild @@ -61,21 +58,15 @@ set __GenRespFiles=0 if not exist "%__ObjDir%\ryujit.rsp" set __GenRespFiles=1 if not exist "%__ObjDir%\cpp.rsp" set __GenRespFiles=1 if "%__GenRespFiles%"=="1" ( - if exist "%__ReproProjectBinDir%" rd /s /q "%__ReproProjectBinDir%" - if exist "%__ReproProjectObjDir%" rd /s /q "%__ReproProjectObjDir%" - - %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%\packaging\publish1" /p:Configuration=%__BuildType% /t:IlcCompile "%__ReproProjectDir%\repro.csproj" - call :CopyResponseFile "%__ReproProjectObjDir%\native\repro.ilc.rsp" "%__ObjDir%\ryujit.rsp" - - if exist "%__ReproProjectBinDir%" rd /s /q "%__ReproProjectBinDir%" - if exist "%__ReproProjectObjDir%" rd /s /q "%__ReproProjectObjDir%" + %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%" /p:Configuration=%__BuildType% /t:Clean,IlcCompile "%__ProjectDir%\src\ILCompiler\repro\repro.csproj" + call :CopyResponseFile "%__ObjDir%\repro\native\repro.ilc.rsp" "%__ObjDir%\ryujit.rsp" set __ExtraArgs=/p:NativeCodeGen=cpp if /i "%__BuildType%"=="debug" ( set __ExtraArgs=!__ExtraArgs! "/p:AdditionalCppCompilerFlags=/MTd" ) - %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%\packaging\publish1" /p:Configuration=%__BuildType% /t:IlcCompile "%__ReproProjectDir%\repro.csproj" !__ExtraArgs! - call :CopyResponseFile "%__ReproProjectObjDir%\native\repro.ilc.rsp" "%__ObjDir%\cpp.rsp" + %_msbuildexe% /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%__BinDir%" /p:Configuration=%__BuildType% /t:Clean,IlcCompile "%__ProjectDir%\src\ILCompiler\repro\repro.csproj" !__ExtraArgs! + call :CopyResponseFile "%__ObjDir%\repro\native\repro.ilc.rsp" "%__ObjDir%\cpp.rsp" ) :AfterVsDevGenerateRespFiles exit /b %ERRORLEVEL% @@ -108,4 +99,4 @@ rem %1 Full path to the file, %2 Variable to receive the file name setlocal for %%i in ("%1") DO set fileName=%%~ni endlocal & set "%2=%fileName%" -goto:eof
\ No newline at end of file +goto:eof diff --git a/buildscripts/build-managed.sh b/buildscripts/build-managed.sh index 5a0970eb2..3913ec757 100755 --- a/buildscripts/build-managed.sh +++ b/buildscripts/build-managed.sh @@ -26,17 +26,39 @@ build_managed_corert() __buildproj=$__ProjectRoot/build.proj __buildlog=$__ProjectRoot/msbuild.$__BuildArch.log - if [ -z "${ToolchainMilestone}" ]; then - ToolchainMilestone=testing - fi - __buildarch="$__BuildArch" if [ "$__buildarch" = "armel" ]; then __buildarch=arm __ExtraMsBuildArgs="$__ExtraMsBuildArgs /p:BinDirPlatform=armel" fi - $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:RelativeProductBinDir=$__RelativeProductBinDir /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:TestNugetRuntimeId=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) /p:ToolchainMilestone=${ToolchainMilestone} $__UnprocessedBuildArgs $__ExtraMsBuildArgs + $__dotnetclipath/dotnet msbuild "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Restore /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) $__UnprocessedBuildArgs $__ExtraMsBuildArgs + export BUILDERRORLEVEL=$? + + echo + + # Pull the build summary from the log file + tail -n 4 "$__buildlog" + echo Build Exit Code = $BUILDERRORLEVEL + if [ $BUILDERRORLEVEL != 0 ]; then + exit $BUILDERRORLEVEL + fi + + # Buildtools tooling is not capable of publishing netcoreapp currently. Use helper projects to publish skeleton of + # the standalone app that the build injects actual binaries into later. + $__dotnetclipath/dotnet restore $__sourceroot/ILCompiler/netcoreapp/ilc.csproj -r $__NugetRuntimeId + export BUILDERRORLEVEL=$? + if [ $BUILDERRORLEVEL != 0 ]; then + exit $BUILDERRORLEVEL + fi + $__dotnetclipath/dotnet publish $__sourceroot/ILCompiler/netcoreapp/ilc.csproj -r $__NugetRuntimeId -o $__ProductBinDir/tools + export BUILDERRORLEVEL=$? + if [ $BUILDERRORLEVEL != 0 ]; then + exit $BUILDERRORLEVEL + fi + chmod +x $__ProductBinDir/tools/ilc + + $__ProjectRoot/Tools/msbuild.sh "$__buildproj" /m /nologo /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__buildlog" /t:Build /p:RepoPath=$__ProjectRoot /p:RepoLocalBuild="true" /p:CleanedTheBuild=$__CleanBuild /p:NuPkgRid=$__NugetRuntimeId /p:OSGroup=$__BuildOS /p:Configuration=$__BuildType /p:Platform=$__buildarch /p:COMPUTERNAME=$(hostname) /p:USERNAME=$(id -un) $__UnprocessedBuildArgs $__ExtraMsBuildArgs export BUILDERRORLEVEL=$? echo @@ -87,7 +109,7 @@ get_official_cross_builds() exit $BUILDERRORLEVEL fi tar xvf ./build.tar.gz ./System.Native.a - mv ./System.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/packaging/publish1/framework + mv ./System.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/framework rm -rf ./build.tar.gz fi if [ -n ${__coreclrsource} ]; then @@ -96,7 +118,7 @@ get_official_cross_builds() if [ $BUILDERRORLEVEL != 0 ]; then exit $BUILDERRORLEVEL fi - mv ./libSystem.Globalization.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/packaging/publish1/framework + mv ./libSystem.Globalization.Native.a $__ProjectRoot/bin/Product/Linux.${__BuildArch}.${__BuildType}/framework fi fi } diff --git a/buildscripts/build-native.sh b/buildscripts/build-native.sh index 3cfa086dd..a001b6f57 100755 --- a/buildscripts/build-native.sh +++ b/buildscripts/build-native.sh @@ -119,7 +119,6 @@ build_host_native_corert() build_native_corert cp ${__ProductHostBinDir}/jitinterface.so ${__ProductBinDir} - cp ${__ProductHostBinDir}/jitinterface.so ${__ProductBinDir}/packaging/publish1 export __BuildArch=$__SavedBuildArch export __IntermediatesDir=$__SavedIntermediatesDir diff --git a/buildscripts/build-restore.cmd b/buildscripts/build-restore.cmd new file mode 100644 index 000000000..7abc7ad08 --- /dev/null +++ b/buildscripts/build-restore.cmd @@ -0,0 +1,46 @@ +@if not defined _echo @echo off +setlocal EnableDelayedExpansion + +set __ThisScriptShort=%0 + +if /i "%1" == "/?" goto HelpVarCall +if /i "%1" == "-?" goto HelpVarCall +if /i "%1" == "/h" goto HelpVarCall +if /i "%1" == "-h" goto HelpVarCall +if /i "%1" == "/help" goto HelpVarCall +if /i "%1" == "-help" goto HelpVarCall + +if defined BUILDVARS_DONE goto :AfterVarSetup + +goto :NormalVarCall + +:HelpVarCall +call %~dp0buildvars-setup.cmd -help +exit /b 1 + +:NormalVarCall +call %~dp0buildvars-setup.cmd %* + +IF NOT ERRORLEVEL 1 goto AfterVarSetup +echo Setting build variables failed. +exit /b %ERRORLEVEL% + +:AfterVarSetup + +:: Restore the Tools directory +call "%__ProjectDir%\init-tools.cmd" + +"%__DotNetCliPath%\dotnet.exe" msbuild "%__ProjectDir%\build.proj" /nologo /t:Restore /flp:v=normal;LogFile=build-restore.log /p:NuPkgRid=win7-x64 /maxcpucount /p:OSGroup=%__BuildOS% /p:Configuration=%__BuildType% /p:Platform=%__BuildArch% %__ExtraMsBuildParams% +IF ERRORLEVEL 1 goto ErrorExit + +rem Buildtools tooling is not capable of publishing netcoreapp currently. Use helper projects to publish skeleton of +rem the standalone app that the build injects actual binaries into later. +"%__DotNetCliPath%\dotnet.exe" restore "%__SourceDir%\ILCompiler\netcoreapp\ilc.csproj" -r win7-x64 +IF ERRORLEVEL 1 goto ErrorExit +"%__DotNetCliPath%\dotnet.exe" publish "%__SourceDir%\ILCompiler\netcoreapp\ilc.csproj" -r win7-x64 -o "%__RootBinDir%\%__BuildOS%.%__BuildArch%.%__BuildType%\tools" +IF ERRORLEVEL 1 goto ErrorExit + +exit /b 0 + +:ErrorExit +exit /b 1 diff --git a/buildscripts/buildvars-setup.cmd b/buildscripts/buildvars-setup.cmd index b52e6b7be..137b3942d 100644 --- a/buildscripts/buildvars-setup.cmd +++ b/buildscripts/buildvars-setup.cmd @@ -17,7 +17,6 @@ set "__RootBinDir=%__ProjectDir%\bin" set "__LogsDir=%__RootBinDir%\Logs" set __MSBCleanBuildArgs= set __SkipTestBuild= -set __ToolchainMilestone=testing set "__DotNetCliPath=%__ProjectDir%\Tools\dotnetcli" :Arg_Loop @@ -44,7 +43,6 @@ if /i "%1" == "clean" (set __CleanBuild=1&shift&goto Arg_Loop) if /i "%1" == "skiptests" (set __SkipTests=1&shift&goto Arg_Loop) if /i "%1" == "skipvsdev" (set __SkipVsDev=1&shift&goto Arg_Loop) -if /i "%1" == "/milestone" (set __ToolchainMilestone=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/dotnetclipath" (set __DotNetCliPath=%2&shift&shift&goto Arg_Loop) if /i "%1" == "/officialbuildid" (set "__ExtraMsBuildParams=/p:OfficialBuildId=%2"&shift&shift&goto Arg_Loop) @@ -54,15 +52,11 @@ exit /b 1 :ArgsDone :: Set the remaining variables based upon the determined build configuration -set "__BinDir=%__RootBinDir%\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" +set "__BinDir=%__RootBinDir%\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__ObjDir=%__RootBinDir%\obj\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__IntermediatesDir=%__RootBinDir%\obj\Native\%__BuildOS%.%__BuildArch%.%__BuildType%\" -set "__RelativeProductBinDir=bin\Product\%__BuildOS%.%__BuildArch%.%__BuildType%" set "__NativeBuildLog=%__LogsDir%\Native_%__BuildOS%__%__BuildArch%__%__BuildType%.log" set "__BuildLog=%__LogsDir%\msbuild_%__BuildOS%__%__BuildArch%__%__BuildType%.log" -set "__ReproProjectDir=%__ProjectDir%\src\ILCompiler\repro" -set "__ReproProjectBinDir=%__BinDir%\repro" -set "__ReproProjectObjDir=%__ObjDir%\repro" :: Generate path to be set for CMAKE_INSTALL_PREFIX to contain forward slash set "__CMakeBinDir=%__BinDir%" @@ -174,4 +168,4 @@ echo Build type: one of Debug, Checked, Release ^(default: Debug^). echo Visual Studio version: vs2015, vs2017 ^(defaults to highest detected^). echo clean: force a clean build ^(default is to perform an incremental build^). echo skiptests: skip building tests ^(default: tests are built^). -exit /b 1
\ No newline at end of file +exit /b 1 diff --git a/buildscripts/buildvars-setup.sh b/buildscripts/buildvars-setup.sh index 1e84a9836..178a4391c 100755 --- a/buildscripts/buildvars-setup.sh +++ b/buildscripts/buildvars-setup.sh @@ -251,11 +251,10 @@ export __IntermediatesDir="$__rootbinpath/obj/Native/$__BuildOS.$__BuildArch.$__ if [ $__CrossBuild = 1 ]; then export __IntermediatesHostDir="$__rootbinpath/obj/Native/$__BuildOS.$__HostArch.$__BuildType" fi -export __ProductBinDir="$__rootbinpath/Product/$__BuildOS.$__BuildArch.$__BuildType" +export __ProductBinDir="$__rootbinpath/$__BuildOS.$__BuildArch.$__BuildType" if [ $__CrossBuild = 1 ]; then - export __ProductHostBinDir="$__rootbinpath/Product/$__BuildOS.$__HostArch.$__BuildType" + export __ProductHostBinDir="$__rootbinpath/$__BuildOS.$__HostArch.$__BuildType" fi -export __RelativeProductBinDir="bin/Product/$__BuildOS.$__BuildArch.$__BuildType" # CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set. # This is needed by CLI to function. diff --git a/dependencies.props b/dependencies.props new file mode 100644 index 000000000..1946a2df2 --- /dev/null +++ b/dependencies.props @@ -0,0 +1,10 @@ +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <RyuJITVersion>2.1.0-preview1-25412-03</RyuJITVersion> + <ObjectWriterVersion>1.0.19-prerelease-00001</ObjectWriterVersion> + <CoreFXVersion>4.5.0-preview1-25417-02</CoreFXVersion> + <MicrosoftNETCoreNativeVersion>2.0.0-beta-25021-03</MicrosoftNETCoreNativeVersion> + <MicrosoftNETCoreAppPackageVersion>2.0.0-preview2-25312-01</MicrosoftNETCoreAppPackageVersion> + <XunitNetcoreExtensionsVersion>1.0.1-prerelease-01616-05</XunitNetcoreExtensionsVersion> + </PropertyGroup> +</Project> @@ -8,14 +8,6 @@ <OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment> </PropertyGroup> - <!-- - Switching to the .NET Core version of the BuildTools tasks seems to break numerous scenarios, such as VS intellisense and resource designer. - Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. - --> - <PropertyGroup> - <BuildToolsTargetsDesktop Condition="'$(OsEnvironment)'=='Windows_NT'">true</BuildToolsTargetsDesktop> - </PropertyGroup> - <!-- Initialize the basic BuildOS, BuildType, BuildConfig from build script, if present --> <PropertyGroup> <OSGroup Condition="'$(OSGroup)'==''">$(__BuildOS)</OSGroup> @@ -66,94 +58,30 @@ <!-- Output directories --> <BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir> <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir> - <ProductBinDir Condition="'$(ProductBinDir)'==''">$(BinDir)Product/</ProductBinDir> - <TestWorkingDir Condition="'$(TestWorkingDir)'==''">$(BinDir)tests/</TestWorkingDir> + <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath> <PackageOutputRoot Condition="'$(PackageOutputRoot)'=='' and '$(NonShippingPackage)' == 'true'">$(BinDir)packages_noship/</PackageOutputRoot> - <PackageOutputRoot Condition="'$(PackageOutputRoot)'=='' and '$(NonShippingPackage)' != 'true'">$(ProductBinDir)pkg/</PackageOutputRoot> - - <!-- Folder where restored Nuget packages will go --> - <PackagesOutDir Condition="'$(PackagesOutDir)'==''">$(BinDir)packages/</PackagesOutDir> + <PackageOutputRoot Condition="'$(PackageOutputRoot)'==''">$(BinDir)packages/</PackageOutputRoot> <!-- Input Directories --> <PackagesDir Condition="'$(PackagesDir)'==''">$(ProjectDir)packages/</PackagesDir> - <ToolRuntimePath Condition="'$(ToolRuntimePath)'==''">$(ProjectDir)Tools/</ToolRuntimePath> - <ToolsDir Condition="'$(UseToolRuntimeForToolsDir)'=='true'">$(ToolRuntimePath)</ToolsDir> - <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> - <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolRuntimePath)dotnetcli/</DotnetCliPath> - <OverrideToolHost>$(DotnetCliPath)dotnet</OverrideToolHost> - <BuildToolsTaskDir Condition="'$(BuildToolsTargetsDesktop)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir> - <BuildToolsTaskDir Condition="'$(BuildToolsTaskDir)'==''">$(ToolsDir)</BuildToolsTaskDir> - <PackagingTaskDir>$(BuildToolsTaskDir)</PackagingTaskDir> - </PropertyGroup> - - <!-- Import the packaging props --> - <Import Project="$(MSBuildThisFileDirectory)Packaging.props" /> - - <!-- Set up the default output and intermediate paths --> - <PropertyGroup> - <OSPlatformConfig>$(BinDirOSGroup).$(BinDirPlatform).$(BinDirConfiguration)</OSPlatformConfig> - - <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(ProductBinDir)</BaseOutputPath> - <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(OSPlatformConfig)/$(MSBuildProjectName)/</PackageOutputPath> - <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(PackageOutputPath)symbols/</SymbolPackageOutputPath> - <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)</OutputPath> - - <!-- Folder where we will drop the Nuget package for the toolchain --> - <ProductPackageDir Condition="'$(ProductPackageDir)'==''">$(BaseOutputPath)$(OSPlatformConfig)/packaging/</ProductPackageDir> + <RestorePackagesPath>$(PackagesDir)</RestorePackagesPath> - <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath> - <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)\</IntermediateOutputRootPath> - <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)\</IntermediateOutputPath> - <AotPackageReferencePath Condition="'$(AotPackageReferencePath)'==''">$(IntermediateOutputRootPath)\CoreRTRef</AotPackageReferencePath> - <EcmaMetadataDllPath Condition="'$(EcmaMetadataDllPath)'==''">$(PackagesDir)/runtime.win10-x64-aot.Microsoft.Private.CoreFx.UAP/4.5.0-preview1-25417-02/runtimes/win10-x64-aot/lib/uap10.1</EcmaMetadataDllPath> - - <TestPath Condition="'$(TestPath)'==''">$(TestWorkingDir)$(OSPlatformConfig)\$(MSBuildProjectName)\</TestPath> - - <PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath> + <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> </PropertyGroup> - <Import Project="$(ToolRuntimePath)BuildVersion.targets" Condition="Exists('$(ToolRuntimePath)BuildVersion.targets')" /> - - <!-- list of nuget package sources passed to dnu --> - <ItemGroup Condition="'$(ExcludeInternetFeeds)' != 'true'"> - <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corert/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> - </ItemGroup> + <!-- Import Build tools common props file where repo-independent properties are found --> + <Import Project="$(ToolsDir)Build.Common.props" Condition="Exists('$(ToolsDir)Build.Common.props')" /> - <!-- list of directories to perform batch restore --> - <ItemGroup> - <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> - </ItemGroup> + <!-- Provides package dependency version properties and verification/auto-upgrade configuration --> + <Import Project="$(MSBuildThisFileDirectory)dependencies.props" /> <PropertyGroup> - <DotnetToolCommand Condition="'$(DotnetToolCommand)' == '' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> - <DotnetToolCommand Condition="'$(DotnetToolCommand)' == '' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> - <DnuToolPath Condition="'$(DnuToolPath)'==''">$(DotnetToolCommand)</DnuToolPath> - - <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> - - <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> - <DnuRestoreCommand Condition="'$(ParallelRestore)'=='true'">$(DnuRestoreCommand) --parallel</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> - <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand> + <!-- Default any assembly not specifying a key to use the Open Key --> + <AssemblyKey>Open</AssemblyKey> </PropertyGroup> - <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> - <!-- When we do a traversal build we get all packages up front, don't restore them again --> - <RestorePackages>false</RestorePackages> - </PropertyGroup> - - <!-- Use Roslyn Compilers to build --> - <PropertyGroup> - <UseSharedCompilation>true</UseSharedCompilation> - </PropertyGroup> - - <Import Project="$(ToolsDir)Roslyn.Common.props" /> + <!-- Import the packaging props --> + <Import Project="$(MSBuildThisFileDirectory)Packaging.props" /> <!-- Set up Default symbol and optimization for Configuration --> <PropertyGroup Condition="'$(ConfigurationGroup)' == 'Debug'"> @@ -184,13 +112,45 @@ <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> - <!-- Set up some common paths --> <PropertyGroup> <CommonPath>$(SourceDir)Common\src</CommonPath> <CommonTestPath>$(SourceDir)Common\tests</CommonTestPath> </PropertyGroup> + <!-- Set up the default output and intermediate paths --> + <PropertyGroup> + <OSPlatformConfig>$(BinDirOSGroup).$(BinDirPlatform).$(BinDirConfiguration)</OSPlatformConfig> + + <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(BinDir)</BaseOutputPath> + + <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)</OutputPath> + + <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)/</IntermediateOutputRootPath> + <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRootPath)$(MSBuildProjectName)</IntermediateOutputPath> + + <RuntimePath Condition="'$(RuntimePath)' == ''">$(IntermediateOutputRootPath)test-runtime/</RuntimePath> + + <!-- Use the shared tools host and runtime for testing --> + <TestHostRootPath Condition="'$(TestHostRootPath)' == ''">$(DotnetCliPath)</TestHostRootPath> + + <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(PackageOutputRoot)$(OSPlatformConfig)/$(MSBuildProjectName)/</PackageOutputPath> + <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)'==''">$(PackageOutputPath)symbols/</SymbolPackageOutputPath> + + <!-- Folder where we will drop the Nuget package for the toolchain --> + <ProductPackageDir Condition="'$(ProductPackageDir)'==''">$(BaseOutputPath)$(OSPlatformConfig)/packaging/</ProductPackageDir> + + <RestoreOutputPath Condition="'$(RestoreOutputPath)'==''">$(IntermediateOutputPath)</RestoreOutputPath> + + <AotPackageReferencePath Condition="'$(AotPackageReferencePath)'==''">$(IntermediateOutputRootPath)\AotPackageReference</AotPackageReferencePath> + + <PackagesBasePath Condition="'$(PackagesBasePath)'==''">$(BinDir)$(OSPlatformConfig)</PackagesBasePath> + </PropertyGroup> + + <ItemGroup> + <SupplementalTestData Include="$(RuntimePath)*.dll" /> + </ItemGroup> + <!-- initialize all the targets variables to false as they should only be set below --> <PropertyGroup> <TargetsWindows>false</TargetsWindows> @@ -282,7 +242,9 @@ </PropertyGroup> <PropertyGroup> - <PackageTargetFramework Condition="'$(PackageTargetFramework)' == ''">netcoreapp2.0</PackageTargetFramework> + <!-- Disable built-in recursive restore from NuGet.targets. It collides with dir.traversal.targets. --> + <RestoreRecursive>false</RestoreRecursive> + <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> <NuGetTargetMoniker Condition="'$(NuGetTargetFramework)' == ''">.NETCoreApp,Version=v2.0</NuGetTargetMoniker> <BuildPackageLibraryReferences>false</BuildPackageLibraryReferences> </PropertyGroup> @@ -292,7 +254,7 @@ <SkipTests Condition="'$(SkipTests)'=='' and ('$(OsEnvironment)'=='Windows_NT' and '$(TargetsWindows)'!='true')">true</SkipTests> </PropertyGroup> - <!-- Use the latest Roslyn compilers --> - <Import Condition="'$(CompilerPropsAlreadyImported)'!='true' and '$(OsEnvironment)'=='Windows_NT'" Project="$(BuildToolsTaskDir)roslyn/build/Microsoft.Net.Compilers.props" /> - + <!-- Use Roslyn Compilers to build --> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'!='true' and Exists('$(RoslynPropsFile)') and '$(UseRoslynCompilers)'!='false'" /> + <Import Project="$(RoslynPropsFile)" Condition="'$(RunningOnUnix)'=='true' and Exists('$(RoslynPropsFile)')" /> </Project> diff --git a/dir.targets b/dir.targets index aaf9c39c4..788a01823 100644 --- a/dir.targets +++ b/dir.targets @@ -17,9 +17,41 @@ <CLSCompliant Condition="'$(CLSCompliant)'==''">false</CLSCompliant> </PropertyGroup> - <!-- Setting IsTestProject prior to Build.Common.targets --> + <!-- Set default references for netstandard1.3 --> + <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> + <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + <TargetFrameworkVersion>v1.3</TargetFrameworkVersion> + </PropertyGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'"> + <PackageReference Include="NETStandard.Library"> + <Version>1.6.1</Version> + </PackageReference> + </ItemGroup> + + <!-- Set default references for netcoreapp1.1 --> + <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'"> + <NuGetTargetMoniker>.NETCoreApp,Version=v1.1</NuGetTargetMoniker> + <!-- This tells VS that this is .NET Core app - uses .NET Core debugger, etc. --> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <TargetFrameworkVersion>v1.1</TargetFrameworkVersion> + <NoWarn>$(NoWarn);1701;1702</NoWarn> + <!-- Force .dll extension even if output type is exe. --> + <TargetExt>.dll</TargetExt> + </PropertyGroup> + <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'"> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>1.1.2</Version> + </PackageReference> + </ItemGroup> + + <!-- Set non-empty TargetFrameworkIdentifier to avoid defaulting to .NETPortable --> + <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == ''"> + <TargetFrameworkIdentifier>.NETStandard</TargetFrameworkIdentifier> + </PropertyGroup> + <PropertyGroup> - <IsTestProject Condition="'$(IsTestProject)'=='' And $(MSBuildProjectName.EndsWith('.tests', StringComparison.OrdinalIgnoreCase))">true</IsTestProject> + <NugetRuntimeIdentifier Condition="'$(NugetRuntimeIdentifier)' == ''">$(RuntimeIdentifiers)</NugetRuntimeIdentifier> </PropertyGroup> <Import Project="$(ToolsDir)/Build.Common.targets" /> @@ -45,4 +77,5 @@ <!-- We set this property to avoid MSBuild errors regarding not setting TargetFrameworkProfile (see above line) --> <PortableNuGetMode>true</PortableNuGetMode> </PropertyGroup> + </Project> diff --git a/dir.traversal.targets b/dir.traversal.targets index d2f3e98b6..6a17968e2 100644 --- a/dir.traversal.targets +++ b/dir.traversal.targets @@ -1,107 +1,6 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="FilterProjects"> - <PropertyGroup> - <FilterToOSGroup Condition="'$(FilterToOSGroup)'=='' and '$(OSGroup)'!='' and '$(OSGroup)'!='AnyOS'">$(OSGroup)</FilterToOSGroup> - </PropertyGroup> - - <ItemGroup> - <!-- list each append as a seperate item to force re-evaluation of AdditionalProperties metadata --> - <Project> - <AdditionalProperties Condition="'%(Project.TargetGroup)'!=''">TargetGroup=%(Project.TargetGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <FilterToTargetGroup Condition="'$(FilterToTargetGroup)'!=''">$(FilterToTargetGroup)</FilterToTargetGroup> - </Project> - <Project> - <FilterToOSGroup Condition="'$(FilterToOSGroup)'!=''">$(FilterToOSGroup)</FilterToOSGroup> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.OSGroup)'!=''">OSGroup=%(Project.OSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.Platform)'!=''">Platform=%(Project.Platform);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.FilterToOSGroup)'!=''">FilterToOSGroup=%(Project.FilterToOSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.FilterToTargetGroup)'!=''">FilterToTargetGroup=%(Project.FilterToTargetGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.InputOSGroup)' != ''">InputOSGroup=%(Project.InputOSGroup);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <Project> - <AdditionalProperties Condition="'%(Project.BuildAllOSGroups)' != ''">BuildAllOSGroups=%(Project.BuildAllOSGroups);%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - <!-- If a project isn't setting the OSGroup via metadata then undefine it so that the globally set OSGroup doesn't override empty OSGroup --> - <Project> - <UndefineProperties Condition="'%(Project.OSGroup)'==''">%(Project.UndefineProperties);OSGroup</UndefineProperties> - </Project> - <Project> - <UndefineProperties Condition="'%(Project.Extension)'!='.builds' and '%(Project.Extension)'!='.proj'">%(Project.UndefineProperties);TestTFMs;FilterToOSGroup;FilterToTestTFM;DefaultBuildAllTarget;SerializeProjects;BuildAllOSGroups</UndefineProperties> - </Project> - </ItemGroup> - - <!-- If we have enabled code coverage and set the projects to be serialized we need to pass that property down to the childe projects --> - <ItemGroup Condition="'$(CodeCoverageEnabled)'=='true' and '$(SerializeProjects)'=='true'"> - <Project> - <AdditionalProperties>SerializeProjects=true;%(Project.AdditionalProperties)</AdditionalProperties> - </Project> - </ItemGroup> - - <PropertyGroup> - <OSGroupList>AnyOS;$(FilterToOSGroup);</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='OSX'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='Linux'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='FreeBSD'">$(OSGroupList);Unix;</OSGroupList> - <OSGroupList Condition="'$(FilterToOSGroup)'=='NetBSD'">$(OSGroupList);Unix;</OSGroupList> - </PropertyGroup> - - <ItemGroup Condition="'$(FilterToOSGroup)'!='' and '$(BuildAllOSGroups)' != 'true'"> - <ProjectsToBuild Include="@(Project)" Condition="$(OSGroupList.Contains('%(Project.OSGroup);'))" /> - - <Project Remove="@(Project)" /> - <Project Include="@(ProjectsToBuild)" /> - </ItemGroup> - - </Target> - - <Target Name="DumpTargets" DependsOnTargets="FilterProjects"> - <MSBuild Targets="$(DefaultBuildAllTarget)" - Projects="@(Project)" - Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true" - ContinueOnError="ErrorAndContinue" /> - </Target> - - - <Target Name="ProducesPackageId" - Returns="@(PackageIds)" - DependsOnTargets="FilterProjects"> - <MSBuild Targets="ProducesPackageId" - Projects="@(Project)" - BuildInParallel="true" - ContinueOnError="ErrorAndContinue"> - <Output TaskParameter="TargetOutputs" - ItemName="PackageIds" /> - </MSBuild> - <ItemGroup> - <PackageIds Include="@(PackageIds)" /> - </ItemGroup> - </Target> - - <Target Name="ProducesTarget" DependsOnTargets="FilterProjects"> - <MSBuild Targets="ProducesPackageId" - Projects="@(Project)" - BuildInParallel="true" - ContinueOnError="ErrorAndContinue"> - <Output TaskParameter="TargetOutputs" - ItemName="PackageIds" /> - </MSBuild> - <Message Text="%(PackageIds.Identity)" Importance="High" /> - </Target> - - <Target Name="BuildAllProjects" DependsOnTargets="FilterProjects"> + <Target Name="BuildAllProjects"> <PropertyGroup> <DefaultBuildAllTarget Condition="'$(DefaultBuildAllTarget)'==''">$(MSBuildProjectDefaultTargets)</DefaultBuildAllTarget> </PropertyGroup> @@ -149,25 +48,25 @@ <Error Condition="'$(MSBuildLastTaskResult)'=='false'" /> </Target> - <Target Name="RestoreAllProjectPackages"> + <Target Name="RestoreAllProjects"> <Message Importance="High" Text="Restoring project packages..." /> <PropertyGroup> - <DefaultRestoreAllPackagesTarget Condition="'$(DefaultRestoreAllPackagesTarget)'==''">RestorePackages</DefaultRestoreAllPackagesTarget> + <DefaultRestoreAllTarget Condition="'$(DefaultRestoreAllTarget)'==''">Restore</DefaultRestoreAllTarget> </PropertyGroup> <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity however since the project names are unique it will essentially force each to run in its own batch --> - <MSBuild Targets="$(DefaultRestoreAllPackagesTarget)" + <MSBuild Targets="$(DefaultRestoreAllTarget)" Projects="@(Project)" Condition="'$(SerializeProjects)'=='true' AND '%(Identity)' != ''" - Properties="RestoreAllPackages=true" + Properties="RestoreAll=true" ContinueOnError="ErrorAndContinue" /> - <MSBuild Targets="$(DefaultRestoreAllPackagesTarget)" + <MSBuild Targets="$(DefaultRestoreAllTarget)" Projects="@(Project)" Condition="'$(SerializeProjects)'!='true'" - Properties="RestoreAllPackages=true" + Properties="RestoreAll=true" BuildInParallel="true" ContinueOnError="ErrorAndContinue" /> @@ -186,10 +85,10 @@ $(TraversalCleanDependsOn); </TraversalCleanDependsOn> - <TraversalRestorePackagesDependsOn> - RestoreAllProjectPackages; - $(TraversalRestorePackagesDependsOn) - </TraversalRestorePackagesDependsOn> + <TraversalRestoreDependsOn> + RestoreAllProjects; + $(TraversalRestoreDependsOn) + </TraversalRestoreDependsOn> </PropertyGroup> <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" /> @@ -198,6 +97,6 @@ <Target Name="Rebuild" DependsOnTargets="Clean;Build" /> - <Target Name="RestorePackages" DependsOnTargets="$(TraversalRestorePackagesDependsOn)" /> + <Target Name="Restore" DependsOnTargets="$(TraversalRestoreDependsOn)" /> </Project> diff --git a/global.json b/global.json deleted file mode 100644 index ea0c3af8a..000000000 --- a/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "./src/Common" ] -} diff --git a/init-tools.cmd b/init-tools.cmd index 3db46fc0e..242579dc0 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -9,10 +9,8 @@ if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt" set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\ -set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION% -set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json -set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" }, "frameworks": { "netcoreapp1.0": { } } } -set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed +set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild +set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated if [%1]==[force] ( @@ -20,7 +18,7 @@ if [%1]==[force] ( if exist "%PACKAGES_DIR%Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%Microsoft.DotNet.BuildTools" ) -:: If sempahore exists do nothing +:: If semaphore exists do nothing if exist "%BUILD_TOOLS_SEMAPHORE%" ( echo Tools are already initialized. goto :EOF @@ -28,17 +26,15 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" ( if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" -if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%" -echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%" echo Running %0 > "%INIT_TOOLS_LOG%" +set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" -set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip -set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" @@ -51,8 +47,8 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" +call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 exit /b 1 @@ -69,6 +65,9 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( exit /b %INIT_TOOLS_ERRORLEVEL% ) +rem CoreRT does not use special copy of the shared runtime for testing +copy /Y %TOOLRUNTIME_DIR%\csc.runtimeconfig.json %TOOLRUNTIME_DIR%\xunit.console.netcore.runtimeconfig.json + :: Create semaphore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" diff --git a/init-tools.msbuild b/init-tools.msbuild new file mode 100644 index 000000000..1ec33f678 --- /dev/null +++ b/init-tools.msbuild @@ -0,0 +1,11 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <PropertyGroup> + <TargetFramework>netcoreapp1.0</TargetFramework> + <EnableDefaultItems>false</EnableDefaultItems> + <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> + <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion)</BaseIntermediateOutputPath> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.BuildTools" Version="$(BuildToolsPackageVersion)" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/init-tools.sh b/init-tools.sh index a2a94c801..5c67b0c1a 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -7,151 +7,115 @@ __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli __DOTNET_CMD=$__DOTNET_PATH/dotnet if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +export __BUILDTOOLS_USE_CSPROJ=true __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION -__PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json -__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"netcoreapp1.0\": { } } }" -__INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done - -# Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc -get_current_linux_name() { - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then - echo "ubuntu.16.04" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 16.10)" -eq 1 ]; then - echo "ubuntu.16.10" - return 0 - fi - - echo "ubuntu" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - echo "centos" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - echo "rhel" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - echo "debian" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then - echo "fedora.23" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 24)" -eq 1 ]; then - echo "fedora.24" - return 0 - fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "opensuse.13.2" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 42.1)" -eq 1 ]; then - echo "opensuse.42.1" - return 0 - fi - fi - - # Cannot determine Linux distribution, assuming Ubuntu 14.04. - echo "ubuntu" - return 0 -} +__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib +__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild +__INIT_TOOLS_DONE_MARKER_DIR=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION +__INIT_TOOLS_DONE_MARKER=$__INIT_TOOLS_DONE_MARKER_DIR/done if [ -z "$__DOTNET_PKG" ]; then + if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then + echo "Warning: build not supported on 32 bit Unix" + fi OSName=$(uname -s) case $OSName in Darwin) OS=OSX __DOTNET_PKG=dotnet-dev-osx-x64 - __DOTNET_RUNTIME_PKG=dotnet-osx-x64 ulimit -n 2048 ;; Linux) - __DOTNET_PKG="dotnet-dev-$(get_current_linux_name)-x64" - __DOTNET_RUNTIME_PKG="dotnet-$(get_current_linux_name)-x64" + __DOTNET_PKG=dotnet-dev-linux-x64 OS=Linux ;; *) - echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools." + echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools." OS=Linux - __DOTNET_PKG=dotnet-dev-ubuntu-x64 - __DOTNET_RUNTIME_PKG=dotnet-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-linux-x64 ;; esac fi + if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then + __PATCH_CLI_NUGET_FRAMEWORKS=0 + if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log + if [ ! -e $__DOTNET_PATH ]; then mkdir -p "$__DOTNET_PATH" - - echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" - # curl has HTTPS CA trust-issues less often than wget, so lets try that first. - echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + + if [ -n "$DOTNET_TOOLSET_DIR" ] && [ -d "$DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION" ]; then + echo "Copying $DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION to $__DOTNET_PATH" >> $__init_tools_log + cp -r $DOTNET_TOOLSET_DIR/$__DOTNET_TOOLS_VERSION/* $__DOTNET_PATH + elif [ -n "$DOTNET_TOOL_DIR" ] && [ -d "$DOTNET_TOOL_DIR" ]; then + echo "Copying $DOTNET_TOOL_DIR to $__DOTNET_PATH" >> $__init_tools_log + cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH else - wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + echo "Installing dotnet cli..." + __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" + # curl has HTTPS CA trust-issues less often than wget, so lets try that first. + echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log + which curl > /dev/null 2> /dev/null + if [ $? -ne 0 ]; then + wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + else + curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} + fi + cd $__DOTNET_PATH + tar -xf $__DOTNET_PATH/dotnet.tar + + cd $__scriptpath + + __PATCH_CLI_NUGET_FRAMEWORKS=1 fi - cd $__DOTNET_PATH - tar -xf $__DOTNET_PATH/dotnet.tar + fi - # Delete the bundled in runtime. - rm -rf $__DOTNET_PATH/shared - # Install .NET Core 1.0.4 until we get CLI updated to a version that has it bundled in - echo "Installing .NETCore 1.0.4..." - __NETCORE10_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/1.0.4/${__DOTNET_RUNTIME_PKG}.1.0.4.tar.gz" - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/netcore10.tar ${__NETCORE10_LOCATION} - else - wget -q -O $__DOTNET_PATH/netcore10.tar ${__NETCORE10_LOCATION} + if [ -n "$BUILD_TOOLS_TOOLSET_DIR" ] && [ -d "$BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION" ]; then + echo "Copying $BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION to $__TOOLRUNTIME_DIR" >> $__init_tools_log + cp -r $BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/* $__TOOLRUNTIME_DIR + elif [ -n "$BUILD_TOOLS_TOOL_DIR" ] && [ -d "$BUILD_TOOLS_TOOL_DIR" ]; then + echo "Copying $BUILD_TOOLS_TOOL_DIR to $__TOOLRUNTIME_DIR" >> $__init_tools_log + cp -r $BUILD_TOOLS_TOOL_DIR/* $__TOOLRUNTIME_DIR + else + if [ ! -e $__BUILD_TOOLS_PATH ]; then + echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log + $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log + if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi fi - tar -xf $__DOTNET_PATH/netcore10.tar - # Install .NET Core 1.1.0 until we get CLI updated to a version that has it bundled in - echo "Installing .NETCore 1.1.0..." - __NETCORE11_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/1.1.0/${__DOTNET_RUNTIME_PKG}.1.1.0.tar.gz" - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/netcore11.tar ${__NETCORE11_LOCATION} - else - wget -q -O $__DOTNET_PATH/netcore11.tar ${__NETCORE11_LOCATION} - fi - tar -xf $__DOTNET_PATH/netcore11.tar + echo "Initializing BuildTools..." + echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log - cd $__scriptpath + # Executables restored with .NET Core 2.0 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 >> $__init_tools_log + if [ "$?" != "0" ]; then + echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2 + exit 1 + fi fi - if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi - echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE" + 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 + ls $__scriptpath/Tools/*.sh | xargs chmod +x + ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x - if [ ! -e $__BUILD_TOOLS_PATH ]; then - echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log - $__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log - if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi - fi + Tools/crossgen.sh $__scriptpath/Tools - echo "Initializing BuildTools..." - echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log - $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log - if [ "$?" != "0" ]; then - echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2 - exit 1 - fi + # CoreRT does not use special copy of the shared runtime for testing + cp $__TOOLRUNTIME_DIR/csc.runtimeconfig.json $__TOOLRUNTIME_DIR/xunit.console.netcore.runtimeconfig.json + mkdir -p $__INIT_TOOLS_DONE_MARKER_DIR touch $__INIT_TOOLS_DONE_MARKER + echo "Done initializing tools." else echo "Tools are already initialized" diff --git a/src/AotPackageReference/AotPackageReference.depproj b/src/AotPackageReference/AotPackageReference.depproj index 7bd4e0752..e276b9103 100644 --- a/src/AotPackageReference/AotPackageReference.depproj +++ b/src/AotPackageReference/AotPackageReference.depproj @@ -7,18 +7,29 @@ --> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> <OutputPath>$(AotPackageReferencePath)</OutputPath> </PropertyGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup> <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> - <NuGetRuntimeIdentifier>win8-aot</NuGetRuntimeIdentifier> + <TargetFramework>uap10.1</TargetFramework> + <RuntimeIdentifiers>win10-x64-aot</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.Private.CoreFx.UAP"> + <Version>$(CoreFxVersion)</Version> + </PackageReference> + </ItemGroup> + + <ItemGroup> + <FileToInclude Include="System.Runtime" /> + <FileToInclude Include="System.Runtime.Extensions" /> + <FileToInclude Include="System.Collections" /> + <FileToInclude Include="System.Console" /> + <FileToInclude Include="System.Private.Reflection.Metadata.Ecma335" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/AotPackageReference/project.json b/src/AotPackageReference/project.json deleted file mode 100644 index 6a2550f23..000000000 --- a/src/AotPackageReference/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "1.2.0-beta-24906-01", - "System.Runtime": "4.4.0-beta-24906-01", - "System.Reflection.Primitives":"4.4.0-beta-24906-01", - "System.Runtime.Extensions": "4.4.0-beta-24906-01", - "System.Collections": "4.4.0-beta-24906-01", - "System.Resources.ResourceManager": "4.4.0-beta-24906-01", - "System.Console": "4.4.0-beta-24906-01", - - "System.Threading.Tasks": "4.4.0-beta-24906-01", - "System.Text.Encoding.Extensions": "4.4.0-beta-24906-01", - "System.Reflection.TypeExtensions": "4.4.0-beta-24906-01", - "System.Runtime.InteropServices": "4.4.0-beta-24906-01", - "System.Private.Uri": "4.4.0-beta-24906-01", - "System.IO": "4.4.0-beta-24906-01", - "System.Globalization": "4.4.0-beta-24906-01", - "System.ObjectModel": "4.4.0-beta-24906-01", - "System.Collections.Concurrent": "4.4.0-beta-24906-01", - "System.Reflection.Metadata": "1.4.2", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "uap10.1": { } - }, - "runtimes" : { - "win8-aot": { } - } -} diff --git a/src/BuildIntegration/BuildIntegration.proj b/src/BuildIntegration/BuildIntegration.proj new file mode 100644 index 000000000..5340405aa --- /dev/null +++ b/src/BuildIntegration/BuildIntegration.proj @@ -0,0 +1,18 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/build</OutputPath> + </PropertyGroup> + + <ItemGroup> + <Content Include="*.*" Exclude="$(MSBuildProjectFile)" /> + </ItemGroup> + + <Target Name="Build"> + <Copy SourceFiles="@(Content)" DestinationFolder="$(OutputPath)" /> + </Target> + + <Target Name="Restore" /> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets index 6c86ef0c2..ab95850bc 100644 --- a/src/BuildIntegration/Microsoft.NETCore.Native.targets +++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets @@ -108,14 +108,7 @@ See the LICENSE file in the project root for more information. <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(NativeObject)))" /> - <PropertyGroup> - <TestHost Condition="'$(OS)' == 'Windows_NT'">CoreRun.exe</TestHost> - <TestHost Condition="'$(OS)' != 'Windows_NT'">corerun</TestHost> - </PropertyGroup> - - <Exec Command=""$(IlcPath)\$(TestHost)" "$(IlcPath)\ilc.dll" @"$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).ilc.rsp""> - </Exec> - + <Exec Command=""$(IlcPath)\tools\ilc" @"$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).ilc.rsp"" /> </Target> <Import Project="Microsoft.NETCore.Native.Windows.props" Condition="'$(TargetOS)' == 'Windows_NT'" /> @@ -168,7 +161,11 @@ See the LICENSE file in the project root for more information. <CustomLibArg Include="@(LibInputs->'%(Identity)')" /> </ItemGroup> + <MakeDir Directories="$(NativeIntermediateOutputPath)" /> <WriteLinesToFile File="$(NativeIntermediateOutputPath)lib.rsp" Lines="@(CustomLibArg)" Overwrite="true" Condition="'$(OS)' == 'Windows_NT'" /> + + <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(SharedLibrary)))" /> + <Exec Command="$(CppLibCreator) @"$(NativeIntermediateOutputPath)lib.rsp"" Condition="'$(OS)' == 'Windows_NT'" /> <Exec Command="$(CppLibCreator) @(CustomLibArg, ' ')" Condition="'$(OS)' != 'Windows_NT'" /> </Target> diff --git a/src/Common/src/Internal/Metadata/NativeFormat/Generator/NativeFormatGen.csproj b/src/Common/src/Internal/Metadata/NativeFormat/Generator/NativeFormatGen.csproj index 23b7508ab..f9927e466 100644 --- a/src/Common/src/Internal/Metadata/NativeFormat/Generator/NativeFormatGen.csproj +++ b/src/Common/src/Internal/Metadata/NativeFormat/Generator/NativeFormatGen.csproj @@ -1,10 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{EE99759F-C776-4F0E-8B06-E65E833B2059}</ProjectGuid> <OutputType>Exe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>NativeFormatGen</RootNamespace> diff --git a/src/Common/test-runtime/XUnit.Runtime.depproj b/src/Common/test-runtime/XUnit.Runtime.depproj new file mode 100644 index 000000000..ffceb82f5 --- /dev/null +++ b/src/Common/test-runtime/XUnit.Runtime.depproj @@ -0,0 +1,34 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets + This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here + --> + <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RidSpecificAssets>true</RidSpecificAssets> + <OutputPath>$(RuntimePath)</OutputPath> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="xunit.console.netcore"> + <Version>1.0.3-prerelease-00921-01</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.xunit.netcore.extensions"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + </ItemGroup> + <ItemGroup> + <PackageToInclude Include="xunit.abstractions"/> + <PackageToInclude Include="xunit.assert"/> + <PackageToInclude Include="xunit.extensibility.core"/> + <PackageToInclude Include="xunit.extensibility.execution"/> + <PackageToInclude Include="xunit.runner.utility"/> + <PackageToInclude Include="Microsoft.xunit.netcore.extensions"/> + <PackageToInclude Include="xunit.console.netcore" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json deleted file mode 100644 index 8d7ad6dcb..000000000 --- a/src/Common/test-runtime/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - - "System.Reflection.Metadata": "1.4.2", - "System.Collections.Immutable": "1.3.1", - - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.4.3", - - "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", - "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", - - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03", - "xunit.console.netcore": "1.0.3-prerelease-00607-01" - }, - "frameworks": { - "netstandard1.3": { } - } -} diff --git a/src/Framework/Framework-native.depproj b/src/Framework/Framework-native.depproj new file mode 100644 index 000000000..cc3093531 --- /dev/null +++ b/src/Framework/Framework-native.depproj @@ -0,0 +1,22 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/framework</OutputPath> + <UseCommonOutputDirectory>true</UseCommonOutputDirectory> + </PropertyGroup> + + <PropertyGroup> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Native"> + <Version>$(MicrosoftNETCoreNativeVersion)</Version> + </PackageReference> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/Framework/Framework-uapaot.depproj b/src/Framework/Framework-uapaot.depproj new file mode 100644 index 000000000..7488de4de --- /dev/null +++ b/src/Framework/Framework-uapaot.depproj @@ -0,0 +1,31 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/framework</OutputPath> + <UseCommonOutputDirectory>true</UseCommonOutputDirectory> + </PropertyGroup> + + <PropertyGroup> + <NuGetTargetMoniker>UAP,Version=v10.1</NuGetTargetMoniker> + <TargetFramework>uap10.1</TargetFramework> + <RuntimeIdentifiers>win10-x64-aot</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.Private.CoreFx.UAP"> + <Version>$(CoreFxVersion)</Version> + </PackageReference> + </ItemGroup> + + <ItemGroup> + <!-- Pickup a few selected aot-specific files from uapaot instead --> + <FileToInclude Include="System.Linq.Expressions" /> + <FileToInclude Include="System.Reflection.Primitives" /> + <FileToInclude Include="System.Runtime.InteropServices" /> + + <FileToInclude Include="System.Private.Reflection.Metadata.Ecma335" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/Framework/Framework.depproj b/src/Framework/Framework.depproj new file mode 100644 index 000000000..ed450b2b2 --- /dev/null +++ b/src/Framework/Framework.depproj @@ -0,0 +1,58 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/framework</OutputPath> + </PropertyGroup> + + <PropertyGroup> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> + <RuntimeIdentifiers Condition="$(NuPkgRid.StartsWith('osx.'))">osx-x64</RuntimeIdentifiers> + <RuntimeIdentifiers Condition="$(NuPkgRid.StartsWith('ubuntu.'))">linux-x64</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> + </PropertyGroup> + + <ItemGroup> + <ProjectReference Include="Framework-uapaot.depproj"> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + <ProjectReference Include="Framework-native.depproj" Condition="$(TargetsUnix)"> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.Private.CoreFx.NETCoreApp"> + <Version>$(CoreFxVersion)</Version> + </PackageReference> + + <!-- TODO: These packages should be comming via regular references --> + <PackageReference Include="System.Memory"> + <Version>$(CoreFxVersion)</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>$(CoreFxVersion)</Version> + </PackageReference> + </ItemGroup> + + <ItemGroup> + <!-- Pickup a few selected aot-specific files from uapaot instead --> + <FileToExclude Include="System.Linq.Expressions" /> + <FileToExclude Include="System.Reflection.Primitives" /> + <FileToExclude Include="System.Runtime.InteropServices" /> + + <!-- TODO: Upstack framework --> + <FileToExclude Include="System.Private.DataContractSerialization" /> + <FileToExclude Include="System.Private.Xml" /> + <FileToExclude Include="System.Reflection.DispatchProxy" /> + <FileToExclude Include="System.Private.Xml.Linq" /> + <FileToExclude Include="System.Data.Common" /> + <FileToExclude Include="System.Diagnostics.StackTrace" /> + + <!-- TODO: Unmanaged --> + <FileToExclude Include="clrcompression" /> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj b/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj index 98dca3d11..44a8b33cb 100644 --- a/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj +++ b/src/ILCompiler.Compiler/src/ILCompiler.Compiler.csproj @@ -1,43 +1,22 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{13BB3788-C3EB-4046-8105-A95F8AE49404}</ProjectGuid> <OutputType>Library</OutputType> <RootNamespace>ILCompiler.Compiler</RootNamespace> <AssemblyName>ILCompiler.Compiler</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.3.0</Version> + </PackageReference> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> - <ProjectReference Include="..\..\ILCompiler.DependencyAnalysisFramework\src\ILCompiler.DependencyAnalysisFramework.csproj"> - <Project>{dac23e9f-f826-4577-ae7a-0849ff83280c}</Project> - <Name>ILCompiler.DependencyAnalysisFramework</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.MetadataTransform\src\ILCompiler.MetadataTransform.csproj"> - <Project>{a965ea82-219d-48f7-ad51-bc030c16cc6f}</Project> - <Name>ILCompiler.MetadataTransform</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj"> - <Project>{d66338d4-f9e4-4051-b302-232c6bfb6ef6}</Project> - <Name>ILCompiler.MetadataWriter</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> + <ProjectReference Include="..\..\ILCompiler.DependencyAnalysisFramework\src\ILCompiler.DependencyAnalysisFramework.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataTransform\src\ILCompiler.MetadataTransform.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj" /> + <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj" /> </ItemGroup> <ItemGroup> <Compile Include="..\..\Common\src\Internal\Runtime\GCDescEncoder.cs"> @@ -393,8 +372,5 @@ <Link>JitInterface\CorInfoTypes.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'" /> </Project> diff --git a/src/ILCompiler.Compiler/src/project.json b/src/ILCompiler.Compiler/src/project.json deleted file mode 100644 index 43580f1ce..000000000 --- a/src/ILCompiler.Compiler/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.IO.MemoryMappedFiles": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "System.Collections.Immutable": "1.3.1", - "System.Runtime.CompilerServices.Unsafe": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/ILCompiler.CppCodeGen/src/ILCompiler.CppCodeGen.csproj b/src/ILCompiler.CppCodeGen/src/ILCompiler.CppCodeGen.csproj index 84865ff5e..1ef83f8bd 100644 --- a/src/ILCompiler.CppCodeGen/src/ILCompiler.CppCodeGen.csproj +++ b/src/ILCompiler.CppCodeGen/src/ILCompiler.CppCodeGen.csproj @@ -1,39 +1,18 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{971AE7E7-08C6-48B4-902A-63851E6DAC66}</ProjectGuid> <OutputType>Library</OutputType> <RootNamespace>ILCompiler</RootNamespace> <AssemblyName>ILCompiler.CppCodeGen</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> - </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> - <ProjectReference Include="..\..\ILCompiler.DependencyAnalysisFramework\src\ILCompiler.DependencyAnalysisFramework.csproj"> - <Project>{dac23e9f-f826-4577-ae7a-0849ff83280c}</Project> - <Name>ILCompiler.DependencyAnalysisFramework</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.Compiler\src\ILCompiler.Compiler.csproj"> - <Project>{13BB3788-C3EB-4046-8105-A95F8AE49404}</Project> - <Name>ILCompiler.Compiler</Name> - </ProjectReference> + <ProjectReference Include="..\..\ILCompiler.DependencyAnalysisFramework\src\ILCompiler.DependencyAnalysisFramework.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataTransform\src\ILCompiler.MetadataTransform.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj" /> + <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj" /> + <ProjectReference Include="..\..\ILCompiler.Compiler\src\ILCompiler.Compiler.csproj" /> </ItemGroup> <ItemGroup> <Compile Include="..\..\Common\src\TypeSystem\IL\ILImporter.cs"> @@ -60,8 +39,5 @@ <Compile Include="CppCodeGen\NodeDataSection.cs" /> <Compile Include="CppCodeGen\ILToCppImporter.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'" /> </Project> diff --git a/src/ILCompiler.CppCodeGen/src/project.json b/src/ILCompiler.CppCodeGen/src/project.json deleted file mode 100644 index 43580f1ce..000000000 --- a/src/ILCompiler.CppCodeGen/src/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.IO.MemoryMappedFiles": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "System.Collections.Immutable": "1.3.1", - "System.Runtime.CompilerServices.Unsafe": "4.3.0", - "System.Security.Cryptography.Algorithms": "4.3.0", - "System.Security.Cryptography.Primitives": "4.3.0" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj b/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj index 82991f93e..e66316c2d 100644 --- a/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj +++ b/src/ILCompiler.DependencyAnalysisFramework/src/ILCompiler.DependencyAnalysisFramework.csproj @@ -1,25 +1,18 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{DAC23E9F-F826-4577-AE7A-0849FF83280C}</ProjectGuid> <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ILCompiler.DependencyAnalysisFramework</RootNamespace> <AssemblyName>ILCompiler.DependencyAnalysisFramework</AssemblyName> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> + <PackageReference Include="System.Xml.ReaderWriter"> + <Version>4.3.0</Version> + </PackageReference> + <PackageReference Include="System.Collections.Immutable"> + <Version>1.3.1</Version> + </PackageReference> </ItemGroup> <ItemGroup> <Compile Include="ComputedStaticDependencyNode.cs" /> @@ -36,8 +29,5 @@ <Compile Include="IDependencyNode.cs" /> <Compile Include="NoLogStrategy.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'" /> </Project> diff --git a/src/ILCompiler.DependencyAnalysisFramework/src/project.json b/src/ILCompiler.DependencyAnalysisFramework/src/project.json deleted file mode 100644 index e2b39c402..000000000 --- a/src/ILCompiler.DependencyAnalysisFramework/src/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Xml.ReaderWriter": "4.3.0", - "System.Collections.Immutable": "1.3.1" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj b/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj index 2c51757cb..37f6e2a40 100644 --- a/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj +++ b/src/ILCompiler.DependencyAnalysisFramework/tests/ILCompiler.DependencyAnalysisFramework.Tests.csproj @@ -1,32 +1,25 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{90076B9B-918B-49DD-8ADE-E76426D60B4D}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>ILCompiler.DependencyAnalysisFramework.Tests</AssemblyName> <RootNamespace>ILCompiler.DependencyAnalysisFramework.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <TestTFM>netcoreapp1.1</TestTFM> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\src\ILCompiler.DependencyAnalysisFramework.csproj"> - <Project>{DAC23E9F-F826-4577-AE7A-0849FF83280C}</Project> - <Name>ILCompiler.DependencyAnalysisFramework</Name> - </ProjectReference> + <ProjectReference Include="..\src\ILCompiler.DependencyAnalysisFramework.csproj" /> </ItemGroup> <ItemGroup> - <Compile Include="DependencyAnalysisFrameworkTests.cs" /> - <Compile Include="TestGraph.cs" /> + <PackageReference Include="System.Collections.Immutable"> + <Version>1.3.1</Version> + </PackageReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Compile Include="DependencyAnalysisFrameworkTests.cs" /> + <Compile Include="TestGraph.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json b/src/ILCompiler.DependencyAnalysisFramework/tests/project.json deleted file mode 100644 index be28cf2c6..000000000 --- a/src/ILCompiler.DependencyAnalysisFramework/tests/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Collections.Immutable": "1.3.1", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { } - }, - "supports": { - "coreFx.Test.netcoreapp1.1": { } - } -} diff --git a/src/ILCompiler.MetadataTransform/src/ILCompiler.MetadataTransform.csproj b/src/ILCompiler.MetadataTransform/src/ILCompiler.MetadataTransform.csproj index c4f57ab30..97f6e3ab3 100644 --- a/src/ILCompiler.MetadataTransform/src/ILCompiler.MetadataTransform.csproj +++ b/src/ILCompiler.MetadataTransform/src/ILCompiler.MetadataTransform.csproj @@ -1,33 +1,18 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'"/> <PropertyGroup> - <ProjectGuid>{A965EA82-219D-48F7-AD51-BC030C16CC6F}</ProjectGuid> <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <AssemblyName>ILCompiler.MetadataTransform</AssemblyName> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> - </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> - <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj"> - <Project>{D66338D4-F9E4-4051-B302-232C6BFB6EF6}</Project> - <Name>ILCompiler.MetadataWriter</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> + <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj" /> + <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="System.Reflection.Metadata"> + <Version>1.4.2</Version> + </PackageReference> </ItemGroup> <ItemGroup> <Compile Include="ILCompiler\Metadata\EntityMap.cs" /> @@ -48,8 +33,5 @@ <Compile Include="ILCompiler\Metadata\Transform.String.cs" /> <Compile Include="ILCompiler\Metadata\Transform.Type.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'"/> </Project> diff --git a/src/ILCompiler.MetadataTransform/src/project.json b/src/ILCompiler.MetadataTransform/src/project.json deleted file mode 100644 index 75ee7c0bd..000000000 --- a/src/ILCompiler.MetadataTransform/src/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Reflection.Metadata": "1.4.2" - }, - "frameworks": { - "netstandard1.3": { } - } -} diff --git a/src/ILCompiler.MetadataTransform/tests/ILCompiler.MetadataTransform.Tests.csproj b/src/ILCompiler.MetadataTransform/tests/ILCompiler.MetadataTransform.Tests.csproj index adeee8246..9de4e1df7 100644 --- a/src/ILCompiler.MetadataTransform/tests/ILCompiler.MetadataTransform.Tests.csproj +++ b/src/ILCompiler.MetadataTransform/tests/ILCompiler.MetadataTransform.Tests.csproj @@ -1,33 +1,20 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{B4B713D9-68A1-4EB3-8164-4DC8BE69BCBC}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>ILCompiler.MetadataTransform.Tests</AssemblyName> <RootNamespace>MetadataTransformTests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <TestTFM>netcoreapp1.1</TestTFM> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> - <ProjectReference Include="..\src\ILCompiler.MetadataTransform.csproj"> - <Project>{a965ea82-219d-48f7-ad51-bc030c16cc6f}</Project> - <Name>ILCompiler.MetadataTransform</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj"> - <Project>{D66338D4-F9E4-4051-B302-232C6BFB6EF6}</Project> - <Name>ILCompiler.MetadataWriter</Name> - </ProjectReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\ILCompiler.MetadataTransform.csproj" /> + <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj" /> <ProjectReference Include="PrimaryMetadataAssembly\PrimaryMetadataAssembly.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> <OutputItemType>Content</OutputItemType> @@ -60,9 +47,6 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> <Compile Include="ExplicitScopeTests.cs" /> <Compile Include="MockPolicy.cs" /> <Compile Include="MultifileMetadataPolicy.cs" /> diff --git a/src/ILCompiler.MetadataTransform/tests/ILMetadataAssembly/ILMetadataAssembly.ilproj b/src/ILCompiler.MetadataTransform/tests/ILMetadataAssembly/ILMetadataAssembly.ilproj index f1001ee6a..8e383e067 100644 --- a/src/ILCompiler.MetadataTransform/tests/ILMetadataAssembly/ILMetadataAssembly.ilproj +++ b/src/ILCompiler.MetadataTransform/tests/ILMetadataAssembly/ILMetadataAssembly.ilproj @@ -3,17 +3,9 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>ILMetadataAssembly</AssemblyName> - <ProjectGuid>{347E2A5A-54E5-4482-9723-ED460DE79CE8}</ProjectGuid> - </PropertyGroup> - - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler.MetadataTransform/tests/PrimaryMetadataAssembly/PrimaryMetadataAssembly.csproj b/src/ILCompiler.MetadataTransform/tests/PrimaryMetadataAssembly/PrimaryMetadataAssembly.csproj index e9ccb27f8..82b325adf 100644 --- a/src/ILCompiler.MetadataTransform/tests/PrimaryMetadataAssembly/PrimaryMetadataAssembly.csproj +++ b/src/ILCompiler.MetadataTransform/tests/PrimaryMetadataAssembly/PrimaryMetadataAssembly.csproj @@ -1,29 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>PrimaryMetadataAssembly</AssemblyName> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <IsCoreAssembly>true</IsCoreAssembly> - <!-- - Need to avoid target platform being empty because that would drag in an mscorlib design-time - facade into the references and break us. - --> - <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier> - <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile7</TargetFrameworkProfile> - <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName> - <ImplicitlyExpandTargetFramework>false</ImplicitlyExpandTargetFramework> - <ProjectGuid>{C29B7395-F925-4B0E-972D-187D2D4BFEC7}</ProjectGuid> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> <Compile Include="Platform.cs" /> diff --git a/src/ILCompiler.MetadataTransform/tests/SampleMetadataAssembly/SampleMetadataAssembly.csproj b/src/ILCompiler.MetadataTransform/tests/SampleMetadataAssembly/SampleMetadataAssembly.csproj index 517803320..04ff2298d 100644 --- a/src/ILCompiler.MetadataTransform/tests/SampleMetadataAssembly/SampleMetadataAssembly.csproj +++ b/src/ILCompiler.MetadataTransform/tests/SampleMetadataAssembly/SampleMetadataAssembly.csproj @@ -1,18 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>SampleMetadataAssembly</AssemblyName> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <ProjectGuid>{D29B7395-A925-5B0E-972D-387D2D4BFEC8}</ProjectGuid> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler.MetadataTransform/tests/SampleWinRTMetadataAssembly/SampleWinRTMetadataAssembly.csproj b/src/ILCompiler.MetadataTransform/tests/SampleWinRTMetadataAssembly/SampleWinRTMetadataAssembly.csproj index 28d819e73..514982407 100644 --- a/src/ILCompiler.MetadataTransform/tests/SampleWinRTMetadataAssembly/SampleWinRTMetadataAssembly.csproj +++ b/src/ILCompiler.MetadataTransform/tests/SampleWinRTMetadataAssembly/SampleWinRTMetadataAssembly.csproj @@ -1,18 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>SampleWinRTMetadataAssembly</AssemblyName> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <ProjectGuid>{46CDD663-FCCC-4E74-901F-3D9D5A36A0D9}</ProjectGuid> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler.MetadataTransform/tests/WindowsWinRTMetadataAssembly/WindowsWinRTMetadataAssembly.csproj b/src/ILCompiler.MetadataTransform/tests/WindowsWinRTMetadataAssembly/WindowsWinRTMetadataAssembly.csproj index 765d5761f..d6f36ace1 100644 --- a/src/ILCompiler.MetadataTransform/tests/WindowsWinRTMetadataAssembly/WindowsWinRTMetadataAssembly.csproj +++ b/src/ILCompiler.MetadataTransform/tests/WindowsWinRTMetadataAssembly/WindowsWinRTMetadataAssembly.csproj @@ -1,18 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>WindowsWinRTMetadataAssembly</AssemblyName> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <ProjectGuid>{19D0BAA8-8762-4D64-80AF-53D7A2BBC4AE}</ProjectGuid> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler.MetadataTransform/tests/project.json b/src/ILCompiler.MetadataTransform/tests/project.json deleted file mode 100644 index 0764ff3a5..000000000 --- a/src/ILCompiler.MetadataTransform/tests/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Reflection.Metadata": "1.4.2", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { } - }, - "supports": { - "coreFx.Test.netcoreapp1.1": { } - } -} diff --git a/src/ILCompiler.MetadataWriter/src/ILCompiler.MetadataWriter.csproj b/src/ILCompiler.MetadataWriter/src/ILCompiler.MetadataWriter.csproj index 43ffd7243..9d6864fc9 100644 --- a/src/ILCompiler.MetadataWriter/src/ILCompiler.MetadataWriter.csproj +++ b/src/ILCompiler.MetadataWriter/src/ILCompiler.MetadataWriter.csproj @@ -1,31 +1,12 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <ProjectGuid>{D66338D4-F9E4-4051-B302-232C6BFB6EF6}</ProjectGuid> <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> <AssemblyName>ILCompiler.MetadataWriter</AssemblyName> - <ExcludeResourcesImport>true</ExcludeResourcesImport> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);NATIVEFORMAT_PUBLICWRITER;NETFX_45</DefineConstants> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> - - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - - <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> - </ItemGroup> <Import Project="ILCompiler.MetadataWriter.targets" /> - - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/ILCompiler.MetadataWriter/src/project.json b/src/ILCompiler.MetadataWriter/src/project.json deleted file mode 100644 index 36a099f6b..000000000 --- a/src/ILCompiler.MetadataWriter/src/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj b/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj index 05375b566..9fa87ba2f 100644 --- a/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj +++ b/src/ILCompiler.TypeSystem/src/ILCompiler.TypeSystem.csproj @@ -1,25 +1,22 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" Condition="'$(IsProjectNLibrary)' != 'true'" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}</ProjectGuid> <OutputType>Library</OutputType> <RootNamespace>Internal.TypeSystem</RootNamespace> <AssemblyName>ILCompiler.TypeSystem</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.3</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> + <PackageReference Include="System.IO.MemoryMappedFiles"> + <Version>4.3.0</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Metadata"> + <Version>1.4.2</Version> + </PackageReference> + <PackageReference Include="Microsoft.DiaSymReader"> + <Version>1.0.8</Version> + </PackageReference> </ItemGroup> <ItemGroup> <Compile Include="..\..\Common\src\TypeSystem\Canon\ArrayType.Canon.cs"> @@ -596,8 +593,5 @@ <Link>TypeSystem\Sorting\TypeSystemComparer.cs</Link> </Compile> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" Condition="'$(IsProjectNLibrary)' != 'true'" /> </Project> diff --git a/src/ILCompiler.TypeSystem/src/project.json b/src/ILCompiler.TypeSystem/src/project.json deleted file mode 100644 index 1f6a16ec9..000000000 --- a/src/ILCompiler.TypeSystem/src/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.IO.MemoryMappedFiles": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "Microsoft.DiaSymReader": "1.0.8" - }, - "frameworks": { - "netstandard1.3": {} - } -} diff --git a/src/ILCompiler.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj b/src/ILCompiler.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj index 74380612a..447bf566f 100644 --- a/src/ILCompiler.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj +++ b/src/ILCompiler.TypeSystem/tests/CoreTestAssembly/CoreTestAssembly.csproj @@ -1,29 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>CoreTestAssembly</AssemblyName> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <IsCoreAssembly>true</IsCoreAssembly> - <!-- - Need to avoid target platform being empty because that would drag in an mscorlib design-time - facade into the references and break us. - --> - <TargetPlatformIdentifier>Portable</TargetPlatformIdentifier> - <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile7</TargetFrameworkProfile> - <TargetFrameworkMonikerDisplayName>.NET Portable Subset</TargetFrameworkMonikerDisplayName> - <ImplicitlyExpandTargetFramework>false</ImplicitlyExpandTargetFramework> - <ProjectGuid>{5813B7DC-6588-4553-B04D-387EC9630AC8}</ProjectGuid> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> <Compile Include="Canonicalization.cs" /> diff --git a/src/ILCompiler.TypeSystem/tests/ILTestAssembly/ILTestAssembly.ilproj b/src/ILCompiler.TypeSystem/tests/ILTestAssembly/ILTestAssembly.ilproj index 8ce6d7d2a..8ef1a79ab 100644 --- a/src/ILCompiler.TypeSystem/tests/ILTestAssembly/ILTestAssembly.ilproj +++ b/src/ILCompiler.TypeSystem/tests/ILTestAssembly/ILTestAssembly.ilproj @@ -1,19 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <OutputType>Library</OutputType> <AssemblyName>ILTestAssembly</AssemblyName> - <ProjectGuid>{ED3BECBB-EABE-4717-875D-C91E15FC260E}</ProjectGuid> - </PropertyGroup> - - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <RunTestsForProject>false</RunTestsForProject> </PropertyGroup> <ItemGroup> diff --git a/src/ILCompiler.TypeSystem/tests/TypeSystem.Tests.csproj b/src/ILCompiler.TypeSystem/tests/TypeSystem.Tests.csproj index e6dfeb71a..d46fcc80c 100644 --- a/src/ILCompiler.TypeSystem/tests/TypeSystem.Tests.csproj +++ b/src/ILCompiler.TypeSystem/tests/TypeSystem.Tests.csproj @@ -1,25 +1,24 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{8874CEEC-5594-511B-A44C-5CA9EC1CEB11}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>TypeSystem.Tests</AssemblyName> <RootNamespace>TypeSystem.Tests</RootNamespace> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <TestTFM>netcoreapp1.1</TestTFM> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\src\ILCompiler.TypeSystem.csproj"> - <Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + <PackageReference Include="Microsoft.xunit.netcore.extensions"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Metadata"> + <Version>1.4.2</Version> + </PackageReference> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\src\ILCompiler.TypeSystem.csproj" /> <!-- Make sure the test data gets built --> <ProjectReference Include="CoreTestAssembly\CoreTestAssembly.csproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> @@ -56,8 +55,5 @@ <Compile Include="TestTypeSystemContext.cs" /> <Compile Include="WellKnownTypeTests.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/ILCompiler.TypeSystem/tests/project.json b/src/ILCompiler.TypeSystem/tests/project.json deleted file mode 100644 index ea8222708..000000000 --- a/src/ILCompiler.TypeSystem/tests/project.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "System.Reflection.Metadata": "1.4.2", - "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00807-03", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { } - }, - "supports": { - "coreFx.Test.netcoreapp1.1": { } - } -} diff --git a/src/ILCompiler/ILCompiler.sln b/src/ILCompiler/ILCompiler.sln index 50edff4b5..34d0966cd 100644 --- a/src/ILCompiler/ILCompiler.sln +++ b/src/ILCompiler/ILCompiler.sln @@ -1,16 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26507.0 +VisualStudioVersion = 15.0.26602.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "desktop", "desktop\desktop.csproj", "{B2C35178-5E42-4010-A72A-938711D7F8F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler", "src\ILCompiler.csproj", "{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}" ProjectSection(ProjectDependencies) = postProject {FBA029C3-B184-4457-AEEC-38D0C2523067} = {FBA029C3-B184-4457-AEEC-38D0C2523067} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler", "src\ILCompiler.csproj", "{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "repro", "repro\repro.csproj", "{FBA029C3-B184-4457-AEEC-38D0C2523067}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "repro", "repro\repro.csproj", "{FBA029C3-B184-4457-AEEC-38D0C2523067}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILCompiler.TypeSystem", "..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj", "{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}" EndProject @@ -45,242 +43,222 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|Any CPU.ActiveCfg = Debug|x86 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|arm.ActiveCfg = Debug|arm - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|arm.Build.0 = Debug|arm - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|arm64.ActiveCfg = Debug|arm64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|arm64.Build.0 = Debug|arm64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|armel.ActiveCfg = Debug|armel - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|armel.Build.0 = Debug|armel - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x64.ActiveCfg = Debug|x64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x64.Build.0 = Debug|x64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x86.ActiveCfg = Debug|x86 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Debug|x86.Build.0 = Debug|x86 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|Any CPU.ActiveCfg = Release|x86 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|arm.ActiveCfg = Release|arm - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|arm.Build.0 = Release|arm - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|arm64.ActiveCfg = Release|arm64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|arm64.Build.0 = Release|arm64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|armel.ActiveCfg = Release|armel - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|armel.Build.0 = Release|armel - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x64.ActiveCfg = Release|x64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x64.Build.0 = Release|x64 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x86.ActiveCfg = Release|x86 - {B2C35178-5E42-4010-A72A-938711D7F8F0}.Release|x86.Build.0 = Release|x86 {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm.ActiveCfg = Debug|arm - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm.Build.0 = Debug|arm - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm64.ActiveCfg = Debug|arm64 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm64.Build.0 = Debug|arm64 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|armel.ActiveCfg = Debug|armel - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|armel.Build.0 = Debug|armel + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm.ActiveCfg = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm.Build.0 = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm64.ActiveCfg = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|arm64.Build.0 = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|armel.ActiveCfg = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|armel.Build.0 = Debug|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x64.ActiveCfg = Debug|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x64.Build.0 = Debug|Any CPU - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x86.ActiveCfg = Debug|x86 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x86.Build.0 = Debug|x86 + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Debug|x86.Build.0 = Debug|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|Any CPU.Build.0 = Release|Any CPU - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm.ActiveCfg = Release|arm - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm.Build.0 = Release|arm - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm64.ActiveCfg = Release|arm64 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm64.Build.0 = Release|arm64 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|armel.ActiveCfg = Release|armel - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|armel.Build.0 = Release|armel + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm.ActiveCfg = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm.Build.0 = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm64.ActiveCfg = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|arm64.Build.0 = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|armel.ActiveCfg = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|armel.Build.0 = Release|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x64.ActiveCfg = Release|Any CPU {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x64.Build.0 = Release|Any CPU - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x86.ActiveCfg = Release|x86 - {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x86.Build.0 = Release|x86 + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x86.ActiveCfg = Release|Any CPU + {DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}.Release|x86.Build.0 = Release|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm.ActiveCfg = Debug|arm - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm.Build.0 = Debug|arm - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm64.ActiveCfg = Debug|arm64 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm64.Build.0 = Debug|arm64 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|armel.ActiveCfg = Debug|armel - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|armel.Build.0 = Debug|armel + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm.ActiveCfg = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm.Build.0 = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm64.ActiveCfg = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|arm64.Build.0 = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|armel.ActiveCfg = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|armel.Build.0 = Debug|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x64.ActiveCfg = Debug|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x64.Build.0 = Debug|Any CPU - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x86.ActiveCfg = Debug|x86 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x86.Build.0 = Debug|x86 + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x86.ActiveCfg = Debug|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|x86.Build.0 = Debug|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.Build.0 = Release|Any CPU - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm.ActiveCfg = Release|arm - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm.Build.0 = Release|arm - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm64.ActiveCfg = Release|arm64 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm64.Build.0 = Release|arm64 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|armel.ActiveCfg = Release|armel - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|armel.Build.0 = Release|armel + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm.ActiveCfg = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm.Build.0 = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm64.ActiveCfg = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|arm64.Build.0 = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|armel.ActiveCfg = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|armel.Build.0 = Release|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x64.ActiveCfg = Release|Any CPU {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x64.Build.0 = Release|Any CPU - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x86.ActiveCfg = Release|x86 - {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x86.Build.0 = Release|x86 + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x86.ActiveCfg = Release|Any CPU + {FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|x86.Build.0 = Release|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm.ActiveCfg = Debug|arm - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm.Build.0 = Debug|arm - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm64.ActiveCfg = Debug|arm64 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm64.Build.0 = Debug|arm64 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|armel.ActiveCfg = Debug|armel - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|armel.Build.0 = Debug|armel + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm.ActiveCfg = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm.Build.0 = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm64.ActiveCfg = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|arm64.Build.0 = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|armel.ActiveCfg = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|armel.Build.0 = Debug|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x64.ActiveCfg = Debug|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x64.Build.0 = Debug|Any CPU - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x86.ActiveCfg = Debug|x86 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x86.Build.0 = Debug|x86 + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|x86.Build.0 = Debug|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.Build.0 = Release|Any CPU - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm.ActiveCfg = Release|arm - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm.Build.0 = Release|arm - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm64.ActiveCfg = Release|arm64 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm64.Build.0 = Release|arm64 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|armel.ActiveCfg = Release|armel - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|armel.Build.0 = Release|armel + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm.ActiveCfg = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm.Build.0 = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm64.ActiveCfg = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|arm64.Build.0 = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|armel.ActiveCfg = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|armel.Build.0 = Release|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x64.ActiveCfg = Release|Any CPU {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x64.Build.0 = Release|Any CPU - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x86.ActiveCfg = Release|x86 - {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x86.Build.0 = Release|x86 + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x86.ActiveCfg = Release|Any CPU + {1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|x86.Build.0 = Release|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm.ActiveCfg = Debug|arm - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm.Build.0 = Debug|arm - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm64.ActiveCfg = Debug|arm64 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm64.Build.0 = Debug|arm64 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|armel.ActiveCfg = Debug|armel - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|armel.Build.0 = Debug|armel + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm.ActiveCfg = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm.Build.0 = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm64.ActiveCfg = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|arm64.Build.0 = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|armel.ActiveCfg = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|armel.Build.0 = Debug|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x64.ActiveCfg = Debug|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x64.Build.0 = Debug|Any CPU - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x86.ActiveCfg = Debug|x86 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x86.Build.0 = Debug|x86 + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x86.ActiveCfg = Debug|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Debug|x86.Build.0 = Debug|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|Any CPU.ActiveCfg = Release|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|Any CPU.Build.0 = Release|Any CPU - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm.ActiveCfg = Release|arm - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm.Build.0 = Release|arm - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm64.ActiveCfg = Release|arm64 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm64.Build.0 = Release|arm64 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|armel.ActiveCfg = Release|armel - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|armel.Build.0 = Release|armel + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm.ActiveCfg = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm.Build.0 = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm64.ActiveCfg = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|arm64.Build.0 = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|armel.ActiveCfg = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|armel.Build.0 = Release|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x64.ActiveCfg = Release|Any CPU {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x64.Build.0 = Release|Any CPU - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x86.ActiveCfg = Release|x86 - {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x86.Build.0 = Release|x86 + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x86.ActiveCfg = Release|Any CPU + {DAC23E9F-F826-4577-AE7A-0849FF83280C}.Release|x86.Build.0 = Release|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|Any CPU.Build.0 = Debug|Any CPU - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm.ActiveCfg = Debug|arm - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm.Build.0 = Debug|arm - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm64.ActiveCfg = Debug|arm64 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm64.Build.0 = Debug|arm64 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|armel.ActiveCfg = Debug|armel - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|armel.Build.0 = Debug|armel + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm.ActiveCfg = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm.Build.0 = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm64.ActiveCfg = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|arm64.Build.0 = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|armel.ActiveCfg = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|armel.Build.0 = Debug|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x64.ActiveCfg = Debug|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x64.Build.0 = Debug|Any CPU - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x86.ActiveCfg = Debug|x86 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x86.Build.0 = Debug|x86 + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x86.ActiveCfg = Debug|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Debug|x86.Build.0 = Debug|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|Any CPU.ActiveCfg = Release|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|Any CPU.Build.0 = Release|Any CPU - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm.ActiveCfg = Release|arm - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm.Build.0 = Release|arm - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm64.ActiveCfg = Release|arm64 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm64.Build.0 = Release|arm64 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|armel.ActiveCfg = Release|armel - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|armel.Build.0 = Release|armel + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm.ActiveCfg = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm.Build.0 = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm64.ActiveCfg = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|arm64.Build.0 = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|armel.ActiveCfg = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|armel.Build.0 = Release|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x64.ActiveCfg = Release|Any CPU {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x64.Build.0 = Release|Any CPU - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x86.ActiveCfg = Release|x86 - {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x86.Build.0 = Release|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|Any CPU.ActiveCfg = Debug|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm.ActiveCfg = Debug|arm - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm.Build.0 = Debug|arm - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm64.ActiveCfg = Debug|arm64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm64.Build.0 = Debug|arm64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|armel.ActiveCfg = Debug|armel - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|armel.Build.0 = Debug|armel - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x64.ActiveCfg = Debug|x64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x64.Build.0 = Debug|x64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x86.ActiveCfg = Debug|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x86.Build.0 = Debug|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|Any CPU.ActiveCfg = Release|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm.ActiveCfg = Release|arm - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm.Build.0 = Release|arm - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm64.ActiveCfg = Release|arm64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm64.Build.0 = Release|arm64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|armel.ActiveCfg = Release|armel - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|armel.Build.0 = Release|armel - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x64.ActiveCfg = Release|x64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x64.Build.0 = Release|x64 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x86.ActiveCfg = Release|x86 - {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x86.Build.0 = Release|x86 + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x86.ActiveCfg = Release|Any CPU + {13BB3788-C3EB-4046-8105-A95F8AE49404}.Release|x86.Build.0 = Release|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm64.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|arm64.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|armel.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|armel.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x64.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x64.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Debug|x86.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|Any CPU.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|Any CPU.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm64.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|arm64.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|armel.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|armel.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x64.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x64.Build.0 = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x86.ActiveCfg = Debug|Any CPU + {BE95C560-B508-4588-8907-F9FC5BC1A0CF}.Release|x86.Build.0 = Debug|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm.ActiveCfg = Debug|arm - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm.Build.0 = Debug|arm - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm64.ActiveCfg = Debug|arm64 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm64.Build.0 = Debug|arm64 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|armel.ActiveCfg = Debug|armel - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|armel.Build.0 = Debug|armel + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm.ActiveCfg = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm.Build.0 = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm64.ActiveCfg = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|arm64.Build.0 = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|armel.ActiveCfg = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|armel.Build.0 = Debug|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x64.ActiveCfg = Debug|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x64.Build.0 = Debug|Any CPU - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x86.ActiveCfg = Debug|x86 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x86.Build.0 = Debug|x86 + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x86.ActiveCfg = Debug|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Debug|x86.Build.0 = Debug|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|Any CPU.Build.0 = Release|Any CPU - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm.ActiveCfg = Release|arm - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm.Build.0 = Release|arm - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm64.ActiveCfg = Release|arm64 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm64.Build.0 = Release|arm64 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|armel.ActiveCfg = Release|armel - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|armel.Build.0 = Release|armel + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm.ActiveCfg = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm.Build.0 = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm64.ActiveCfg = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|arm64.Build.0 = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|armel.ActiveCfg = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|armel.Build.0 = Release|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x64.ActiveCfg = Release|Any CPU {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x64.Build.0 = Release|Any CPU - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x86.ActiveCfg = Release|x86 - {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x86.Build.0 = Release|x86 + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x86.ActiveCfg = Release|Any CPU + {D66338D4-F9E4-4051-B302-232C6BFB6EF6}.Release|x86.Build.0 = Release|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm.ActiveCfg = Debug|arm - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm.Build.0 = Debug|arm - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm64.ActiveCfg = Debug|arm64 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm64.Build.0 = Debug|arm64 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|armel.ActiveCfg = Debug|armel - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|armel.Build.0 = Debug|armel + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm.ActiveCfg = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm.Build.0 = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm64.ActiveCfg = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|arm64.Build.0 = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|armel.ActiveCfg = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|armel.Build.0 = Debug|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x64.ActiveCfg = Debug|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x64.Build.0 = Debug|Any CPU - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x86.ActiveCfg = Debug|x86 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x86.Build.0 = Debug|x86 + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x86.ActiveCfg = Debug|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Debug|x86.Build.0 = Debug|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|Any CPU.ActiveCfg = Release|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|Any CPU.Build.0 = Release|Any CPU - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm.ActiveCfg = Release|arm - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm.Build.0 = Release|arm - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm64.ActiveCfg = Release|arm64 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm64.Build.0 = Release|arm64 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|armel.ActiveCfg = Release|armel - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|armel.Build.0 = Release|armel + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm.ActiveCfg = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm.Build.0 = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm64.ActiveCfg = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|arm64.Build.0 = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|armel.ActiveCfg = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|armel.Build.0 = Release|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x64.ActiveCfg = Release|Any CPU {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x64.Build.0 = Release|Any CPU - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x86.ActiveCfg = Release|x86 - {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x86.Build.0 = Release|x86 + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x86.ActiveCfg = Release|Any CPU + {A965EA82-219D-48F7-AD51-BC030C16CC6F}.Release|x86.Build.0 = Release|Any CPU {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm.ActiveCfg = Debug|arm - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm.Build.0 = Debug|arm - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm64.ActiveCfg = Debug|arm64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm64.Build.0 = Debug|arm64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|armel.ActiveCfg = Debug|armel - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|armel.Build.0 = Debug|armel - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x64.ActiveCfg = Debug|x64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x64.Build.0 = Debug|x64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x86.ActiveCfg = Debug|x86 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x86.Build.0 = Debug|x86 + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm.ActiveCfg = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm.Build.0 = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm64.ActiveCfg = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|arm64.Build.0 = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|armel.ActiveCfg = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|armel.Build.0 = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x64.ActiveCfg = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x64.Build.0 = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x86.ActiveCfg = Debug|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Debug|x86.Build.0 = Debug|Any CPU {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|Any CPU.ActiveCfg = Release|Any CPU {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|Any CPU.Build.0 = Release|Any CPU - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm.ActiveCfg = Release|arm - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm.Build.0 = Release|arm - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm64.ActiveCfg = Release|arm64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm64.Build.0 = Release|arm64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|armel.ActiveCfg = Release|armel - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|armel.Build.0 = Release|armel - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x64.ActiveCfg = Release|x64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x64.Build.0 = Release|x64 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x86.ActiveCfg = Release|x86 - {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x86.Build.0 = Release|x86 + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm.ActiveCfg = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm.Build.0 = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm64.ActiveCfg = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|arm64.Build.0 = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|armel.ActiveCfg = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|armel.Build.0 = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x64.ActiveCfg = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x64.Build.0 = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x86.ActiveCfg = Release|Any CPU + {971AE7E7-08C6-48B4-902A-63851E6DAC66}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ILCompiler/ObjectWriter/ObjectWriter.depproj b/src/ILCompiler/ObjectWriter/ObjectWriter.depproj new file mode 100644 index 000000000..d399cc92b --- /dev/null +++ b/src/ILCompiler/ObjectWriter/ObjectWriter.depproj @@ -0,0 +1,21 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/tools</OutputPath> + </PropertyGroup> + + <PropertyGroup> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.DotNet.ObjectWriter"> + <Version>$(ObjectWriterVersion)</Version> + </PackageReference> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project> diff --git a/src/ILCompiler/RyuJIT/RyuJIT.depproj b/src/ILCompiler/RyuJIT/RyuJIT.depproj new file mode 100644 index 000000000..5e543ee5b --- /dev/null +++ b/src/ILCompiler/RyuJIT/RyuJIT.depproj @@ -0,0 +1,39 @@ +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/tools</OutputPath> + </PropertyGroup> + + <PropertyGroup> + <NuGetTargetMoniker>.NETCoreApp,Version=v2.0</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.0</TargetFramework> + <RuntimeIdentifiers>$(NuPkgRid)</RuntimeIdentifiers> + <RuntimeIdentifiers Condition="$(NuPkgRid.StartsWith('win7'))">win-x64</RuntimeIdentifiers> + <RuntimeIdentifiers Condition="$(NuPkgRid.StartsWith('osx.'))">osx-x64</RuntimeIdentifiers> + <RuntimeIdentifiers Condition="$(NuPkgRid.StartsWith('ubuntu.'))">linux-x64</RuntimeIdentifiers> + <RidSpecificAssets>true</RidSpecificAssets> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.Jit"> + <Version>$(RyuJITVersion)</Version> + </PackageReference> + </ItemGroup> + + <Target Name="RenameToJitIlc"> + <ItemGroup> + <ContentWithTargetPath> + <TargetPath>%(Filename)ilc%(Extension)</TargetPath> + </ContentWithTargetPath> + </ItemGroup> + </Target> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + + <PropertyGroup> + <GetCopyToOutputDirectoryItemsDependsOn> + $(GetCopyToOutputDirectoryItemsDependsOn); + RenameToJitIlc + </GetCopyToOutputDirectoryItemsDependsOn> + </PropertyGroup> +</Project> diff --git a/src/ILCompiler/desktop/desktop.csproj b/src/ILCompiler/desktop/desktop.csproj deleted file mode 100644 index b34dff91b..000000000 --- a/src/ILCompiler/desktop/desktop.csproj +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{B2C35178-5E42-4010-A72A-938711D7F8F0}</ProjectGuid> - <OutputType>Exe</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>ILCompiler</RootNamespace> - <AssemblyName>ilc</AssemblyName> - <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier> - <TargetFrameworkVersion>v4.6</TargetFrameworkVersion> - <BaseNuGetRuntimeIdentifier>win7</BaseNuGetRuntimeIdentifier> - <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\Debug\</OutputPath> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <PlatformTarget>x64</PlatformTarget> - <OutputPath>bin\Release\</OutputPath> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <ItemGroup> - <Compile Include="..\src\Program.cs"> - <Link>src\Program.cs</Link> - </Compile> - <Compile Include="..\src\RdXmlRootProvider.cs"> - <Link>src\RdXmlRootProvider.cs</Link> - </Compile> - </ItemGroup> - <ItemGroup> - <Compile Include="..\..\Common\src\CommandLine\CommandLineException.cs"> - <Link>CommandLine\CommandLineException.cs</Link> - </Compile> - <Compile Include="..\..\Common\src\CommandLine\CommandLineHelpers.cs"> - <Link>CommandLine\CommandLineHelpers.cs</Link> - </Compile> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\ILCompiler.Compiler\src\ILCompiler.Compiler.csproj"> - <Project>{13bb3788-c3eb-4046-8105-a95f8ae49404}</Project> - <Name>ILCompiler.Compiler</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.CppCodeGen\src\ILCompiler.CppCodeGen.csproj"> - <Project>{971AE7E7-08C6-48B4-902A-63851E6DAC66}</Project> - <Name>ILCompiler.Compiler.Cpp</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> - <ItemGroup> - <Reference Include="mscorlib" /> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Xml.Linq" /> - </ItemGroup> - <ItemGroup> - <Content Include="..\..\..\bin\Product\Windows_NT.$(Platform).$(Configuration)\packaging\publish1\jitinterface.dll"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\..\..\bin\Product\Windows_NT.$(Platform).$(Configuration)\packaging\publish1\objwriter.dll"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="..\..\..\bin\Product\Windows_NT.$(Platform).$(Configuration)\packaging\publish1\clrjitilc.dll"> - <CopyToOutputDirectory>Always</CopyToOutputDirectory> - </Content> - </ItemGroup> - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> - --> -</Project>
\ No newline at end of file diff --git a/src/ILCompiler/desktop/project.json b/src/ILCompiler/desktop/project.json deleted file mode 100644 index 24010620d..000000000 --- a/src/ILCompiler/desktop/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.IO.MemoryMappedFiles": "4.3.0", - "System.Reflection.Metadata": "1.4.2", - "System.Runtime.CompilerServices.Unsafe": "4.3.0", - "Microsoft.DiaSymReader": "1.1.0", - "System.CommandLine": "0.1.0-e160909-1" - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win7-x64": {} - } -} diff --git a/src/ILCompiler/netcoreapp/ilc.cs b/src/ILCompiler/netcoreapp/ilc.cs new file mode 100644 index 000000000..6158bb254 --- /dev/null +++ b/src/ILCompiler/netcoreapp/ilc.cs @@ -0,0 +1,9 @@ +using System; + +class Program +{ + static void Main() + { + Console.WriteLine("Hello world!"); + } +} diff --git a/src/ILCompiler/netcoreapp/ilc.csproj b/src/ILCompiler/netcoreapp/ilc.csproj new file mode 100644 index 000000000..0a712827e --- /dev/null +++ b/src/ILCompiler/netcoreapp/ilc.csproj @@ -0,0 +1,32 @@ +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp1.1</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="System.Collections.Immutable"> + <Version>1.3.1</Version> + </PackageReference> + <PackageReference Include="System.IO.MemoryMappedFiles"> + <Version>4.3.0</Version> + </PackageReference> + <PackageReference Include="System.Reflection.Metadata"> + <Version>1.4.2</Version> + </PackageReference> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe"> + <Version>4.3.0</Version> + </PackageReference> + <PackageReference Include="System.Xml.ReaderWriter"> + <Version>4.3.0</Version> + </PackageReference> + <PackageReference Include="Microsoft.DiaSymReader"> + <Version>1.0.8</Version> + </PackageReference> + <PackageReference Include="System.CommandLine"> + <Version>0.1.0-e160909-1</Version> + </PackageReference> + </ItemGroup> + +</Project> diff --git a/src/ILCompiler/repro/project.json b/src/ILCompiler/repro/project.json deleted file mode 100644 index 7dc020c70..000000000 --- a/src/ILCompiler/repro/project.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1" - }, - "frameworks": { - "netstandard1.6": {} - } -} diff --git a/src/ILCompiler/repro/repro.csproj b/src/ILCompiler/repro/repro.csproj index 12aeea405..15ed06b83 100644 --- a/src/ILCompiler/repro/repro.csproj +++ b/src/ILCompiler/repro/repro.csproj @@ -1,33 +1,20 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{FBA029C3-B184-4457-AEEC-38D0C2523067}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace></RootNamespace> <AssemblyName>repro</AssemblyName> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <TargetFramework>netcoreapp2.0</TargetFramework> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <OutputPath>bin\Debug</OutputPath> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <OutputPath>bin\Release</OutputPath> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <PropertyGroup> - <StartupObject /> + <SkipSigning>true</SkipSigning> + <GenerateAssemblyInfo>false</GenerateAssemblyInfo> </PropertyGroup> <ItemGroup> - <Compile Include="Program.cs" /> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>$(MicrosoftNETCoreAppPackageVersion)</Version> + </PackageReference> </ItemGroup> <ItemGroup> - <None Include="project.json" /> + <Compile Include="Program.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\BuildIntegration\Microsoft.NETCore.Native.targets" /> diff --git a/src/ILCompiler/repro/repro.ilproj b/src/ILCompiler/repro/repro.ilproj index f60af9310..2c4942695 100644 --- a/src/ILCompiler/repro/repro.ilproj +++ b/src/ILCompiler/repro/repro.ilproj @@ -1,28 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{FBA029C3-B184-4457-AEEC-38D0C2523067}</ProjectGuid> <OutputType>Exe</OutputType> <AssemblyName>repro</AssemblyName> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <OutputPath>bin\Debug</OutputPath> - <ErrorReport>prompt</ErrorReport> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <OutputPath>bin\Release</OutputPath> - <ErrorReport>prompt</ErrorReport> + <TargetFramework>netcoreapp2.0</TargetFramework> + <SkipSigning>true</SkipSigning> </PropertyGroup> <ItemGroup> <Compile Include="repro.il" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\BuildIntegration\Microsoft.NETCore.Native.targets" /> </Project> diff --git a/src/ILCompiler/reproNative/reproNative.vcxproj b/src/ILCompiler/reproNative/reproNative.vcxproj index e76fb5e08..654438da2 100644 --- a/src/ILCompiler/reproNative/reproNative.vcxproj +++ b/src/ILCompiler/reproNative/reproNative.vcxproj @@ -62,7 +62,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>..\..\..\bin\obj\Windows_NT.x64.Debug\repro\native\repro.obj;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Product\Windows_NT.x64.Debug\lib\Runtime.lib</AdditionalDependencies> + <AdditionalDependencies>..\..\..\bin\obj\Windows_NT.x64.Debug\repro\native\repro.obj;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Windows_NT.x64.Debug\sdk\Runtime.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -84,7 +84,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>..\..\..\bin\obj\Windows_NT.x64.Release\repro\native\repro.obj;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Product\Windows_NT.x64.Release\lib\Runtime.lib</AdditionalDependencies> + <AdditionalDependencies>..\..\..\bin\obj\Windows_NT.x64.Release\repro\native\repro.obj;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Windows_NT.x64.Release\sdk\Runtime.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/src/ILCompiler/reproNative/reproNativeCpp.vcxproj b/src/ILCompiler/reproNative/reproNativeCpp.vcxproj index eed584328..70081ce85 100644 --- a/src/ILCompiler/reproNative/reproNativeCpp.vcxproj +++ b/src/ILCompiler/reproNative/reproNativeCpp.vcxproj @@ -63,7 +63,7 @@ <Link> <SubSystem>Console</SubSystem> <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Product\Windows_NT.x64.Debug\lib\PortableRuntime.lib</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Windows_NT.x64.Debug\sdk\PortableRuntime.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -86,7 +86,7 @@ <GenerateDebugInformation>true</GenerateDebugInformation> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Product\Windows_NT.x64.Release\lib\PortableRuntime.lib</AdditionalDependencies> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;bcrypt.lib;%(AdditionalDependencies);..\..\..\bin\Windows_NT.x64.Release\sdk\PortableRuntime.lib</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> diff --git a/src/ILCompiler/src/ILCompiler.csproj b/src/ILCompiler/src/ILCompiler.csproj index 246ea3b46..4258865b6 100644 --- a/src/ILCompiler/src/ILCompiler.csproj +++ b/src/ILCompiler/src/ILCompiler.csproj @@ -1,34 +1,28 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{DD5B6BAA-D41A-4A6E-9E7D-83060F394B10}</ProjectGuid> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/tools</OutputPath> + </PropertyGroup> + <PropertyGroup> <OutputType>Exe</OutputType> <RootNamespace>ILCompiler</RootNamespace> - <!-- This is needed for VS Code debugging for ILC - it only likes DLL extension --> - <!-- This also aligns with .NET Core applications model --> - <!-- Note that we can't change the OutputType to be library - there is no entry point --> - <TargetExt>.dll</TargetExt> <AssemblyName>ilc</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeResourcesImport>true</ExcludeResourcesImport> - <DefineConstants>$(DefineConstants);FXCORE</DefineConstants> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <TargetFramework>netcoreapp1.1</TargetFramework> <CopyNugetImplementations>false</CopyNugetImplementations> </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </PropertyGroup> - <PropertyGroup> - <StartupObject /> - </PropertyGroup> <ItemGroup> - <PackageDestination Include="Tools"> - <InProject>false</InProject> - <TargetFramework>.NetCoreApp,Version=2.0</TargetFramework> - </PackageDestination> + <ProjectReference Include="..\..\ILCompiler.DependencyAnalysisFramework\src\ILCompiler.DependencyAnalysisFramework.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataTransform\src\ILCompiler.MetadataTransform.csproj" /> + <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj" /> + <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj" /> + <ProjectReference Include="..\..\ILCompiler.Compiler\src\ILCompiler.Compiler.csproj" /> + <ProjectReference Include="..\..\ILCompiler.CppCodeGen\src\ILCompiler.CppCodeGen.csproj" /> + </ItemGroup> + <ItemGroup> + <PackageReference Include="System.CommandLine"> + <Version>0.1.0-e160909-1</Version> + </PackageReference> </ItemGroup> <ItemGroup> <Compile Include="Program.cs" /> @@ -43,25 +37,14 @@ </Compile> </ItemGroup> <ItemGroup> - <None Include="project.json" /> - <!-- This is needed for VS Code debugging for ILC --> <Content Include="ilc.runtimeconfig.json"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\..\ILCompiler.Compiler\src\ILCompiler.Compiler.csproj"> - <Project>{13bb3788-c3eb-4046-8105-a95f8ae49404}</Project> - <Name>ILCompiler.Compiler</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.CppCodeGen\src\ILCompiler.CppCodeGen.csproj"> - <Project>{971AE7E7-08C6-48B4-902A-63851E6DAC66}</Project> - <Name>ILCompiler.Compiler.Cpp</Name> - </ProjectReference> - <ProjectReference Include="..\..\ILCompiler.TypeSystem\src\ILCompiler.TypeSystem.csproj"> - <Project>{1a9df196-43a9-44bb-b2c6-d62aa56b0e49}</Project> - <Name>ILCompiler.TypeSystem</Name> - </ProjectReference> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> + <PropertyGroup> + <RunCommand Condition="'$(OS)' == 'Windows_NT'">$(TargetDir)$(AssemblyName).exe</RunCommand> + <RunCommand Condition="'$(OS)' != 'Windows_NT'">$(TargetDir)$(AssemblyName)</RunCommand> + <RunArguments>$(StartArguments)</RunArguments> + </PropertyGroup> </Project> diff --git a/src/ILCompiler/src/Program.cs b/src/ILCompiler/src/Program.cs index 235a395ab..b19f1f6dc 100644 --- a/src/ILCompiler/src/Program.cs +++ b/src/ILCompiler/src/Program.cs @@ -69,7 +69,6 @@ namespace ILCompiler private void InitializeDefaultOptions() { -#if FXCORE // We could offer this as a command line option, but then we also need to // load a different RyuJIT, so this is a future nice to have... if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -98,10 +97,6 @@ namespace ILCompiler default: throw new NotImplementedException(); } -#else - _targetOS = TargetOS.Windows; - _targetArchitecture = TargetArchitecture.X64; -#endif } private ArgumentSyntax ParseCommandLine(string[] args) diff --git a/src/ILCompiler/src/ilc.runtimeconfig.json b/src/ILCompiler/src/ilc.runtimeconfig.json index d0437745b..a1dfd923b 100755 --- a/src/ILCompiler/src/ilc.runtimeconfig.json +++ b/src/ILCompiler/src/ilc.runtimeconfig.json @@ -1,8 +1,7 @@ { "runtimeOptions": { - "framework": { - "name": "Microsoft.NETCore.App", - "version": "1.0.1" + "configProperties": { + "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true } } -}
\ No newline at end of file +} diff --git a/src/ILCompiler/src/project.json b/src/ILCompiler/src/project.json deleted file mode 100644 index 699cbbf77..000000000 --- a/src/ILCompiler/src/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Reflection.Metadata": "1.4.2", - "System.CommandLine": "0.1.0-e160909-1" - }, - "frameworks": { - "netstandard1.6": {} - } -} diff --git a/src/ILVerify/src/ILVerify.csproj b/src/ILVerify/src/ILVerify.csproj index 81f992362..453bcf152 100644 --- a/src/ILVerify/src/ILVerify.csproj +++ b/src/ILVerify/src/ILVerify.csproj @@ -280,4 +280,4 @@ <PackageReference Include="System.Reflection.Metadata" Version="1.4.1" /> <PackageReference Include="System.CommandLine" Version="0.1.0-e160909-1" /> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/src/ILVerify/src/Program.cs b/src/ILVerify/src/Program.cs index b642c2abf..4d577c3e5 100644 --- a/src/ILVerify/src/Program.cs +++ b/src/ILVerify/src/Program.cs @@ -29,8 +29,8 @@ namespace ILVerify private const string SystemModuleSimpleName = "mscorlib"; private bool _help; - private Dictionary<string, string> _inputFilePaths = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase); - private Dictionary<string, string> _referenceFilePaths = new Dictionary<string, string>(StringComparer.InvariantCultureIgnoreCase); + private Dictionary<string, string> _inputFilePaths = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); + private Dictionary<string, string> _referenceFilePaths = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); private IReadOnlyList<Regex> _includePatterns = Array.Empty<Regex>(); private IReadOnlyList<Regex> _excludePatterns = Array.Empty<Regex>(); @@ -45,7 +45,7 @@ namespace ILVerify private void Help(string helpText) { - Console.WriteLine("ILVerify version " + typeof(Program).Assembly.GetName().Version.ToString()); + Console.WriteLine("ILVerify version " + typeof(Program).GetTypeInfo().Assembly.GetName().Version.ToString()); Console.WriteLine(); Console.WriteLine("--help Display this usage message (Short form: -?)"); Console.WriteLine("--reference Reference metadata from the specified assembly (Short form: -r)"); diff --git a/src/Native/Bootstrap/base/CMakeLists.txt b/src/Native/Bootstrap/base/CMakeLists.txt index 7e36b817c..aba667e6e 100644 --- a/src/Native/Bootstrap/base/CMakeLists.txt +++ b/src/Native/Bootstrap/base/CMakeLists.txt @@ -8,7 +8,7 @@ set(SOURCES add_library(bootstrapper STATIC ${SOURCES}) # Install the static bootstrapper library -install (TARGETS bootstrapper DESTINATION lib) +install (TARGETS bootstrapper DESTINATION sdk) if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/bootstrapper.dir/$<CONFIG>/bootstrapper.pdb DESTINATION lib) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/bootstrapper.dir/$<CONFIG>/bootstrapper.pdb DESTINATION sdk) endif() diff --git a/src/Native/Bootstrap/cpp/CMakeLists.txt b/src/Native/Bootstrap/cpp/CMakeLists.txt index fd1ca6f58..48738ea1c 100644 --- a/src/Native/Bootstrap/cpp/CMakeLists.txt +++ b/src/Native/Bootstrap/cpp/CMakeLists.txt @@ -10,7 +10,11 @@ set(SOURCES add_library(bootstrappercpp STATIC ${SOURCES}) # Install the static bootstrappercpp library -install (TARGETS bootstrappercpp DESTINATION lib) +install (TARGETS bootstrappercpp DESTINATION sdk) if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/bootstrappercpp.dir/$<CONFIG>/bootstrappercpp.pdb DESTINATION lib) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/bootstrappercpp.dir/$<CONFIG>/bootstrappercpp.pdb DESTINATION sdk) endif() + +# Install the CppCodeGen support headers +install (FILES ../common.h DESTINATION inc) +install (FILES ../CppCodeGen.h DESTINATION inc) diff --git a/src/Native/Runtime/Full/CMakeLists.txt b/src/Native/Runtime/Full/CMakeLists.txt index 4b9f5b891..af7de3a21 100644 --- a/src/Native/Runtime/Full/CMakeLists.txt +++ b/src/Native/Runtime/Full/CMakeLists.txt @@ -72,7 +72,7 @@ foreach(CONFIG IN LISTS CMAKE_CONFIGURATION_TYPES) endforeach() # Install the static Runtime library -install (TARGETS Runtime DESTINATION lib) +install (TARGETS Runtime DESTINATION sdk) if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Runtime.dir/$<CONFIG>/Runtime.pdb DESTINATION lib) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Runtime.dir/$<CONFIG>/Runtime.pdb DESTINATION sdk) endif() diff --git a/src/Native/Runtime/Portable/CMakeLists.txt b/src/Native/Runtime/Portable/CMakeLists.txt index b9de41ad4..de5872c83 100644 --- a/src/Native/Runtime/Portable/CMakeLists.txt +++ b/src/Native/Runtime/Portable/CMakeLists.txt @@ -12,7 +12,7 @@ add_definitions(-DUSE_PORTABLE_HELPERS) add_library(PortableRuntime STATIC ${COMMON_RUNTIME_SOURCES} ${PORTABLE_RUNTIME_SOURCES}) # Install the static Runtime library -install (TARGETS PortableRuntime DESTINATION lib) +install (TARGETS PortableRuntime DESTINATION sdk) if(WIN32) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/PortableRuntime.dir/$<CONFIG>/PortableRuntime.pdb DESTINATION lib) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/PortableRuntime.dir/$<CONFIG>/PortableRuntime.pdb DESTINATION sdk) endif() diff --git a/src/Native/System.Private.CoreLib.Native/CMakeLists.txt b/src/Native/System.Private.CoreLib.Native/CMakeLists.txt index 741f189e4..760b75e24 100644 --- a/src/Native/System.Private.CoreLib.Native/CMakeLists.txt +++ b/src/Native/System.Private.CoreLib.Native/CMakeLists.txt @@ -24,4 +24,4 @@ endif () include(configure.cmake) -install (TARGETS System.Private.CoreLib.Native DESTINATION lib) +install (TARGETS System.Private.CoreLib.Native DESTINATION sdk) diff --git a/src/Native/gc/sample/GCSample.vcxproj b/src/Native/gc/sample/GCSample.vcxproj index c4944c731..b2e7fbaef 100644 --- a/src/Native/gc/sample/GCSample.vcxproj +++ b/src/Native/gc/sample/GCSample.vcxproj @@ -10,7 +10,6 @@ </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> - <ProjectGuid>{58D6B7AE-0A12-49F0-BCF7-200ED8BA445A}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>GCSample</RootNamespace> </PropertyGroup> diff --git a/src/Native/gc/sample/GCSample.vcxproj.filters b/src/Native/gc/sample/GCSample.vcxproj.filters index f6aacfd0c..d0ff5d655 100644 --- a/src/Native/gc/sample/GCSample.vcxproj.filters +++ b/src/Native/gc/sample/GCSample.vcxproj.filters @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> @@ -63,4 +62,4 @@ <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/Native/jitinterface/CMakeLists.txt b/src/Native/jitinterface/CMakeLists.txt index 5883a1a0c..15091699c 100644 --- a/src/Native/jitinterface/CMakeLists.txt +++ b/src/Native/jitinterface/CMakeLists.txt @@ -23,8 +23,8 @@ add_library(jitinterface ${NATIVE_SOURCES} ) -install (TARGETS jitinterface DESTINATION .) +install (TARGETS jitinterface DESTINATION tools) if(WIN32) target_link_libraries(jitinterface ntdll.lib) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/jitinterface.pdb DESTINATION .) + install (FILES ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/jitinterface.pdb DESTINATION tools) endif(WIN32) diff --git a/src/Runtime.Base/src/Runtime.Base.csproj b/src/Runtime.Base/src/Runtime.Base.csproj index e76d6957b..f4ccefe2f 100644 --- a/src/Runtime.Base/src/Runtime.Base.csproj +++ b/src/Runtime.Base/src/Runtime.Base.csproj @@ -1,32 +1,17 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <ProjectGuid>{CA7FAACD-89ED-4D41-8377-92C1D9055720}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>Runtime.Base</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeDefaultReferences>true</ExcludeDefaultReferences> <IsCoreAssembly>true</IsCoreAssembly> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <!-- Hack to disable analyzers. Replace once https://github.com/dotnet/buildtools/issues/1349 is fixed. --> <CodeAnalyzerDir>$(MSBuildThisFileDirectory)/Documentation</CodeAnalyzerDir> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|arm'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|arm'" /> - - <PropertyGroup> - <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <DefineConstants>FEATURE_GC_STRESS;$(DefineConstants)</DefineConstants> </PropertyGroup> diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.shproj b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.shproj index 39e3cb853..4636cb6c3 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.shproj +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.shproj @@ -1,8 +1,4 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup Label="Globals"> - <ProjectGuid>c5ed3c1d-b572-46f1-8f96-522a85ce1179</ProjectGuid> - <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> - </PropertyGroup> <!-- Set the properties to prevent any items from being excluded from the IDE view --> <PropertyGroup> <TargetsWindows>true</TargetsWindows> diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj index e4d8d7b1b..23fed46c6 100644 --- a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj @@ -1,24 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.CoreLib</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> - <ProjectGuid>{BE95C560-B508-4588-8907-F9FC5BC1A0CF}</ProjectGuid> <OutputType>Library</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <IsCoreAssembly>true</IsCoreAssembly> <CLSCompliant>true</CLSCompliant> + <!-- Use MSFT assembly key for compatibility with uapaot targeting pack --> + <AssemblyKey>MSFT</AssemblyKey> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|arm'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|arm'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|armel'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|armel'" /> <PropertyGroup> <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade> <ExcludeAssemblyInfoPartialFile>true</ExcludeAssemblyInfoPartialFile> diff --git a/src/System.Private.DeveloperExperience.Console/src/System.Private.DeveloperExperience.Console.csproj b/src/System.Private.DeveloperExperience.Console/src/System.Private.DeveloperExperience.Console.csproj index 63e8a67c2..2e09db5d2 100644 --- a/src/System.Private.DeveloperExperience.Console/src/System.Private.DeveloperExperience.Console.csproj +++ b/src/System.Private.DeveloperExperience.Console/src/System.Private.DeveloperExperience.Console.csproj @@ -1,18 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.DeveloperExperience.Console</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{F9EF39E7-C8E4-4776-A952-FEF7A1FC2D3B}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> <ProjectReference Include="..\..\System.Private.StackTraceGenerator\src\System.Private.StackTraceGenerator.csproj" /> @@ -27,7 +21,6 @@ <ReferencePath Include="$(AotPackageReferencePath)\System.Runtime.Extensions.dll" /> <ReferencePath Include="$(AotPackageReferencePath)\System.Collections.dll" /> <ReferencePath Include="$(AotPackageReferencePath)\System.Console.dll" /> - <ReferencePath Include="$(AotPackageReferencePath)\System.IO.dll" /> </ItemGroup> <ItemGroup> diff --git a/src/System.Private.Interop/src/System.Private.Interop.csproj b/src/System.Private.Interop/src/System.Private.Interop.csproj index cb63efb54..d155aa5f0 100644 --- a/src/System.Private.Interop/src/System.Private.Interop.csproj +++ b/src/System.Private.Interop/src/System.Private.Interop.csproj @@ -1,18 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.Interop</AssemblyName> <OutputType>Library</OutputType> - <ProjectGuid>{A85709C9-22D5-4704-8B7A-73751BB4386A}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>$(DefineConstants);TARGET_CORE_API_SET</DefineConstants> <!-- Disable warning about CLSCompliant attributes on members not being needed. --> <NoWarn>$(NoWarn);3021</NoWarn> + <!-- Use MSFT assembly key for compatibility with uapaot targeting pack --> + <AssemblyKey>MSFT</AssemblyKey> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <ProjectReference Include="..\..\AotPackageReference\AotPackageReference.depproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff --git a/src/System.Private.Jit/src/System.Private.Jit.csproj b/src/System.Private.Jit/src/System.Private.Jit.csproj index 20b57f47d..96e9c00ef 100644 --- a/src/System.Private.Jit/src/System.Private.Jit.csproj +++ b/src/System.Private.Jit/src/System.Private.Jit.csproj @@ -1,11 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.Jit</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{82CAE34B-8C3B-4D47-A809-CB2E22E0D36B}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>false</CLSCompliant> <DefineConstants>TYPE_LOADER_IMPLEMENTATION;SUPPORTS_NATIVE_METADATA_TYPE_LOADING;$(DefineConstants)</DefineConstants> @@ -13,9 +11,6 @@ <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(JitSupport)' == 'true'"> <DefineConstants>SUPPORT_JIT;$(DefineConstants)</DefineConstants> </PropertyGroup> @@ -29,7 +24,7 @@ </ProjectReference> <ReferencePath Include="$(AotPackageReferencePath)\System.Runtime.dll" /> <ReferencePath Include="$(AotPackageReferencePath)\System.Runtime.Extensions.dll" /> - <ReferencePath Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> <ProjectReference Include="..\..\System.Private.Reflection.Metadata\src\System.Private.Reflection.Metadata.csproj" /> <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.Experimental.csproj" /> diff --git a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj index b7b298a97..75f14057a 100644 --- a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj +++ b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.Experimental.csproj @@ -1,8 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <AssemblyName>System.Private.Reflection.Core.Experimental</AssemblyName> - <ProjectGuid>{50CDFB37-A390-499E-B3B6-690BE70AB706}</ProjectGuid> <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> diff --git a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj index 8e87be884..f0f7d213d 100644 --- a/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj +++ b/src/System.Private.Reflection.Core/src/System.Private.Reflection.Core.csproj @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(AssemblyName)' == ''"> <AssemblyName>System.Private.Reflection.Core</AssemblyName> - <ProjectGuid>{999BB20D-A032-4836-A587-627D243C1668}</ProjectGuid> </PropertyGroup> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> @@ -16,9 +14,6 @@ <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <ItemGroup> <ProjectReference Include="..\..\AotPackageReference\AotPackageReference.depproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> @@ -35,7 +30,7 @@ </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true' and '$(EcmaMetadataSupport)' == 'true'"> <ProjectReference Include="..\..\System.Private.TypeLoader\src\System.Private.TypeLoader.Experimental.csproj" /> - <ReferencePath Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> </ItemGroup> <ItemGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <Compile Include="System\Reflection\Runtime\Assemblies\EcmaFormat\EcmaFormatRuntimeAssembly.cs" /> diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj index b5580c0b4..069aa60a9 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.Experimental.csproj @@ -1,8 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <AssemblyName>System.Private.Reflection.Execution.Experimental</AssemblyName> - <ProjectGuid>{B48AF2B7-7205-4449-9DFF-44936490E8A5}</ProjectGuid> <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> diff --git a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj index 9771e63a0..75bcf70dc 100644 --- a/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj +++ b/src/System.Private.Reflection.Execution/src/System.Private.Reflection.Execution.csproj @@ -1,22 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(AssemblyName)' == ''"> <AssemblyName>System.Private.Reflection.Execution</AssemblyName> - <ProjectGuid>{306A4D48-0ACF-41C4-BBA0-BCDAD9253E2D}</ProjectGuid> </PropertyGroup> <PropertyGroup> - <AssemblyName>System.Private.Reflection.Execution</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{306A4D48-0ACF-41C4-BBA0-BCDAD9253E2D}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> </PropertyGroup> @@ -26,7 +18,7 @@ <!-- Setup the right references --> <ItemGroup> - <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> diff --git a/src/System.Private.Reflection.Metadata/src/System.Private.Reflection.Metadata.csproj b/src/System.Private.Reflection.Metadata/src/System.Private.Reflection.Metadata.csproj index b02e524c0..36bda112c 100644 --- a/src/System.Private.Reflection.Metadata/src/System.Private.Reflection.Metadata.csproj +++ b/src/System.Private.Reflection.Metadata/src/System.Private.Reflection.Metadata.csproj @@ -1,18 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.Reflection.Metadata</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{45A617DF-FEC7-59C8-FD0D-BD27938DC940}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> </ItemGroup> diff --git a/src/System.Private.Reflection.Metadata/tests/System.Private.Reflection.Metadata.Tests.csproj b/src/System.Private.Reflection.Metadata/tests/System.Private.Reflection.Metadata.Tests.csproj index ed54ed5b5..3d2500695 100644 --- a/src/System.Private.Reflection.Metadata/tests/System.Private.Reflection.Metadata.Tests.csproj +++ b/src/System.Private.Reflection.Metadata/tests/System.Private.Reflection.Metadata.Tests.csproj @@ -2,20 +2,11 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{3A6D978E-156A-4BFF-B394-7F6F6BB22AE1}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>System.Private.Reflection.Metadata.Tests</AssemblyName> <RootNamespace>System.Private.Reflection.Metadata.Tests</RootNamespace> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NugetTargetMoniker>.NETStandard,Version=v1.3</NugetTargetMoniker> - <TestTFM>netcoreapp1.1</TestTFM> - </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <TargetFramework>netstandard1.3</TargetFramework> </PropertyGroup> <PropertyGroup> <NativeFormatCommonPath>..\..\Common\src\Internal\NativeFormat</NativeFormatCommonPath> @@ -35,9 +26,12 @@ <Compile Include="$(MetadataCommonPath)\NativeFormatReaderGen.cs" /> </ItemGroup> <ItemGroup> + <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite"> + <Version>$(XunitNetcoreExtensionsVersion)</Version> + </PackageReference> + </ItemGroup> + <ItemGroup> <ProjectReference Include="..\..\ILCompiler.MetadataWriter\src\ILCompiler.MetadataWriter.csproj"> - <Project>{D66338D4-F9E4-4051-B302-232C6BFB6EF6}</Project> - <Name>ILCompiler.MetadataWriter</Name> <Aliases>writer</Aliases> </ProjectReference> </ItemGroup> @@ -54,8 +48,5 @@ <Compile Include="HashCodeTests.cs" /> <Compile Include="RoundTripTests.cs" /> </ItemGroup> - <ItemGroup> - <None Include="project.json" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Private.Reflection.Metadata/tests/project.json b/src/System.Private.Reflection.Metadata/tests/project.json deleted file mode 100644 index be5b24e24..000000000 --- a/src/System.Private.Reflection.Metadata/tests/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Platforms": "1.1.0", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00807-03", - "test-runtime": { - "target": "project", - "exclude": "compile" - } - }, - "frameworks": { - "netstandard1.3": { } - }, - "supports": { - "coreFx.Test.netcoreapp1.1": { } - } -} diff --git a/src/System.Private.StackTraceGenerator/src/System.Private.StackTraceGenerator.csproj b/src/System.Private.StackTraceGenerator/src/System.Private.StackTraceGenerator.csproj index 77e9568df..652ae6cbb 100644 --- a/src/System.Private.StackTraceGenerator/src/System.Private.StackTraceGenerator.csproj +++ b/src/System.Private.StackTraceGenerator/src/System.Private.StackTraceGenerator.csproj @@ -1,18 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.StackTraceGenerator</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{35A616DA-EEC6-49C4-BD06-AD27938DC94B}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> </ItemGroup> diff --git a/src/System.Private.StackTraceMetadata/src/System.Private.StackTraceMetadata.csproj b/src/System.Private.StackTraceMetadata/src/System.Private.StackTraceMetadata.csproj index 7ffd70b87..5ac0d139a 100644 --- a/src/System.Private.StackTraceMetadata/src/System.Private.StackTraceMetadata.csproj +++ b/src/System.Private.StackTraceMetadata/src/System.Private.StackTraceMetadata.csproj @@ -1,18 +1,12 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.StackTraceMetadata</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{4a4e72b2-143c-4fee-9bdb-43797d6b7963}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> <ProjectReference Include="..\..\System.Private.Reflection.Metadata\src\System.Private.Reflection.Metadata.csproj" /> diff --git a/src/System.Private.Threading/src/System.Private.Threading.csproj b/src/System.Private.Threading/src/System.Private.Threading.csproj index 002200834..666e3374a 100644 --- a/src/System.Private.Threading/src/System.Private.Threading.csproj +++ b/src/System.Private.Threading/src/System.Private.Threading.csproj @@ -1,19 +1,13 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <AssemblyName>System.Private.Threading</AssemblyName> <AssemblyVersion>4.0.0.0</AssemblyVersion> <OutputType>Library</OutputType> - <ProjectGuid>{AD10E5A4-FBA5-4135-9BA4-008723F319B8}</ProjectGuid> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <CLSCompliant>true</CLSCompliant> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> - <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> </ItemGroup> diff --git a/src/System.Private.TypeLoader/src/System.Private.TypeLoader.Experimental.csproj b/src/System.Private.TypeLoader/src/System.Private.TypeLoader.Experimental.csproj index 888d51931..530409f48 100644 --- a/src/System.Private.TypeLoader/src/System.Private.TypeLoader.Experimental.csproj +++ b/src/System.Private.TypeLoader/src/System.Private.TypeLoader.Experimental.csproj @@ -1,8 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <PropertyGroup> <AssemblyName>System.Private.TypeLoader.Experimental</AssemblyName> - <ProjectGuid>{9D3328F2-6D2E-4064-82AE-57EED73872B2}</ProjectGuid> <EcmaMetadataSupport>true</EcmaMetadataSupport> <JitSupport>true</JitSupport> </PropertyGroup> diff --git a/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj b/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj index 2615ff46a..41e4d57e8 100644 --- a/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj +++ b/src/System.Private.TypeLoader/src/System.Private.TypeLoader.csproj @@ -1,9 +1,7 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> +<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup Condition="'$(AssemblyName)' == ''"> <AssemblyName>System.Private.TypeLoader</AssemblyName> - <ProjectGuid>{F36495F7-8CF5-474D-A92D-40317AE2439C}</ProjectGuid> </PropertyGroup> <PropertyGroup> <AssemblyVersion>4.0.0.0</AssemblyVersion> @@ -11,9 +9,6 @@ <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <DefineConstants>TYPE_LOADER_IMPLEMENTATION;$(DefineConstants)</DefineConstants> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" /> <PropertyGroup Condition="'$(EcmaMetadataSupport)' == 'true'"> <DefineConstants>ECMA_METADATA_SUPPORT;$(DefineConstants)</DefineConstants> <METADATA_TYPE_LOADER>true</METADATA_TYPE_LOADER> @@ -43,7 +38,7 @@ </ProjectReference> <ReferencePath Include="$(AotPackageReferencePath)\System.Runtime.dll" /> <ReferencePath Include="$(AotPackageReferencePath)\System.Runtime.Extensions.dll" /> - <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(EcmaMetadataDllPath)\System.Private.Reflection.Metadata.Ecma335.dll" /> + <ReferencePath Condition="'$(EcmaMetadataSupport)' == 'true'" Include="$(AotPackageReferencePath)\System.Private.Reflection.Metadata.Ecma335.dll" /> </ItemGroup> <ItemGroup Condition="'$(IsProjectNLibrary)' != 'true'"> <ProjectReference Include="..\..\System.Private.CoreLib\src\System.Private.CoreLib.csproj" /> diff --git a/src/Test.CoreLib/src/Test.CoreLib.csproj b/src/Test.CoreLib/src/Test.CoreLib.csproj index 7322f6afe..d1cf4c9f0 100644 --- a/src/Test.CoreLib/src/Test.CoreLib.csproj +++ b/src/Test.CoreLib/src/Test.CoreLib.csproj @@ -1,27 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <ProjectGuid>{6BD96201-7F81-4627-BB41-7A2CCB09082F}</ProjectGuid> <OutputType>Library</OutputType> <AssemblyName>Test.CoreLib</AssemblyName> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <ExcludeDefaultReferences>true</ExcludeDefaultReferences> <IsCoreAssembly>true</IsCoreAssembly> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <!-- Hack to disable analyzers. Replace once https://github.com/dotnet/buildtools/issues/1349 is fixed. --> <CodeAnalyzerDir>$(MSBuildThisFileDirectory)/Documentation</CodeAnalyzerDir> </PropertyGroup> - <!-- Default configurations to help VS understand the options --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|arm'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|arm'" /> - <PropertyGroup> - <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <DefineConstants>FEATURE_GC_STRESS;$(DefineConstants)</DefineConstants> </PropertyGroup> diff --git a/src/dir.props b/src/dir.props index ee4a8f319..371514af2 100644 --- a/src/dir.props +++ b/src/dir.props @@ -1,3 +1,9 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> + + <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('System.Private.')) and $(MSBuildProjectDirectory.EndsWith('src'))"> + <OutputPath>$(BaseOutputPath)$(OSPlatformConfig)/sdk</OutputPath> + <UseCommonOutputDirectory>true</UseCommonOutputDirectory> + </PropertyGroup> + </Project> diff --git a/src/dir.targets b/src/dir.targets index 5b1b71f32..34ca873ae 100644 --- a/src/dir.targets +++ b/src/dir.targets @@ -1,18 +1,3 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject> - </PropertyGroup> - <Import Project="..\dir.targets" /> - - <!-- Returns the assembly version of the project for consumption - by the NuGet package generation --> - <Target Name="GetAssemblyVersion" - Returns="$(AssemblyVersion)"/> - - <!-- Returns the generated documentation file for consumption - by the NuGet package generation --> - <Target Name="GetDocumentationFile" - Returns="$(DocumentationFile)"/> - </Project> diff --git a/src/dirs.proj b/src/dirs.proj index 898dd687a..2637ccf87 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -10,33 +10,26 @@ <ExcludeProjects Include="**\ILVerify.csproj" /> <ExcludeProjects Include="**\ILVerify.Tests.csproj" /> + <Project Include="AotPackageReference\AotPackageReference.depproj" /> + + <Project Include="Framework\Framework.depproj" /> + <Project Include="Framework\Framework-uapaot.depproj" /> + <Project Include="Framework\Framework-native.depproj" Condition="$(TargetsUnix)" /> + + <Project Include="ILCompiler\**\*.depproj" /> + <Project Include="*\src\*.csproj" Exclude="@(ExcludeProjects)" /> <Project Include="*\src\*.vbproj" Condition="'$(IncludeVbProjects)'!='false'" Exclude="@(ExcludeProjects)" /> <Project Include="*\test*\**\*.csproj" Exclude="@(ExcludeProjects)" /> <Project Include="*\test*\**\*.vbproj" Condition="'$(IncludeVbProjects)'!='false'" Exclude="@(ExcludeProjects)" /> + + <Project Include="BuildIntegration\BuildIntegration.proj" /> + + <Project Include="ILCompiler\repro\repro.csproj" /> </ItemGroup> <Import Project="..\dir.targets" /> <Import Project="..\dir.traversal.targets" /> - <Import Project="packaging\packages.targets" /> - - <Import Project="$(ToolsDir)packages.targets" Condition="Exists('$(ToolsDir)packages.targets') and '$(ImportGetNuGetPackageVersions)' != 'false'" /> - <Import Project="$(ToolsDir)UpdateBuildValues.targets" Condition="Exists('$(ToolsDir)UpdateBuildValues.targets')" /> - - <PropertyGroup Condition="Exists('$(ToolsDir)packages.targets') and '$(ImportGetNuGetPackageVersions)' != 'false'"> - <TraversalBuildDependsOn> - $(TraversalBuildDependsOn); - BuildPackages; - </TraversalBuildDependsOn> - </PropertyGroup> - - <PropertyGroup Condition="Exists('$(ToolsDir)toolruntime.targets')"> - <TraversalBuildDependsOn> - EnsureBuildToolsRuntime; - $(TraversalBuildDependsOn) - </TraversalBuildDependsOn> - </PropertyGroup> - </Project> diff --git a/src/packaging/netcoreapp/project.json b/src/packaging/netcoreapp/project.json deleted file mode 100644 index cc749c2ad..000000000 --- a/src/packaging/netcoreapp/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "frameworks": { - "netcoreapp2.0": { - "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.5.0-preview1-25417-02", - - "System.Memory": "4.5.0-preview1-25417-02", - "System.Runtime.CompilerServices.Unsafe": "4.5.0-preview1-25417-02", - - "Microsoft.NETCore.Native": "2.0.0-beta-25021-03" - } - } - }, - "runtimes": { - "win7-x64": { }, - "osx.10.10-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { } - } -} diff --git a/src/packaging/objectwriter/project.json b/src/packaging/objectwriter/project.json deleted file mode 100644 index 3181219ba..000000000 --- a/src/packaging/objectwriter/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.DotNet.ObjectWriter": "1.0.19-prerelease-00001" - }, - "frameworks": { - "dnxcore50": { } - }, - "runtimes": { - "win7-x64": { }, - "osx.10.10-x64": { }, - "osx.10.12-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.16.04-x64": { } - } -} diff --git a/src/packaging/packages.targets b/src/packaging/packages.targets deleted file mode 100644 index db48fc34a..000000000 --- a/src/packaging/packages.targets +++ /dev/null @@ -1,361 +0,0 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Target Name="BuildNuGetPackages" AfterTargets="Build"> - <!-- Property needed for creating nupkgs --> - <PropertyGroup> - <ToolchainMilestone Condition="'$(ToolchainMilestone)'==''">prerelease</ToolchainMilestone> - <ToolchainVersion>1.0.6-$(ToolchainMilestone)-00003</ToolchainVersion> - <RuntimeSdkVersion>$(ToolchainVersion)</RuntimeSdkVersion> - - <ToolchainPackageName>Microsoft.DotNet.ILCompiler</ToolchainPackageName> - - <RuntimeSdkPackageNameSuffix Condition="'$(Configuration)'=='Debug'">.Debug</RuntimeSdkPackageNameSuffix> - <RuntimeSdkPackageName>Microsoft.DotNet.ILCompiler.SDK$(RuntimeSdkPackageNameSuffix)</RuntimeSdkPackageName> - - <!-- Uniqify package name per machine-local DNX cache for development purposes --> - <BuildUid>$([System.Guid]::NewGuid().ToString().Replace('-', '').Substring(0, 8))</BuildUid> - - <ToolchainPackageName Condition="'$(ToolchainMilestone)'=='testing'">$(ToolchainPackageName).$(BuildUid)</ToolchainPackageName> - <RuntimeSdkPackageName Condition="'$(ToolchainMilestone)'=='testing'">$(RuntimeSdkPackageName).$(BuildUid)</RuntimeSdkPackageName> - - <LibPrefix Condition="'$(OsEnvironment)'!='Windows_NT'">lib</LibPrefix> - <StaticLibExt Condition="'$(OsEnvironment)'=='Windows_NT'">lib</StaticLibExt> - <StaticLibExt Condition="'$(OsEnvironment)'!='Windows_NT'">a</StaticLibExt> - - <CoreFxPackageVersion>4.5.0-preview1-25417-02</CoreFxPackageVersion> - <CoreFxNuPkgRid Condition="'$(OSGroup)'=='Windows_NT'">win-x64</CoreFxNuPkgRid> - <CoreFxNuPkgRid Condition="'$(OSGroup)'=='OSX'">osx-x64</CoreFxNuPkgRid> - <CoreFxNuPkgRid Condition="'$(OSGroup)'=='Linux'">linux-x64</CoreFxNuPkgRid> - <CoreFxNuPkgRid Condition="'$(CoreFxNuPkgRid)'==''">$(NuPkgRid)</CoreFxNuPkgRid> - - <JitPackageVersion>2.1.0-preview1-25412-03</JitPackageVersion> - <JitNuPkgRid Condition="'$(OSGroup)'=='Windows_NT'">win-x64</JitNuPkgRid> - <JitNuPkgRid Condition="'$(OSGroup)'=='OSX'">osx-x64</JitNuPkgRid> - <JitNuPkgRid Condition="'$(OSGroup)'=='Linux'">linux-x64</JitNuPkgRid> - <JitNuPkgRid Condition="'$(JitNuPkgRid)'==''">$(NuPkgRid)</JitNuPkgRid> - - <MicrosoftNetCoreNativePackageVersion>2.0.0-beta-25021-03</MicrosoftNetCoreNativePackageVersion> - - <ObjectWriterPackageVersion>1.0.19-prerelease-00001</ObjectWriterPackageVersion> - <ObjectWriterNuPkgRid Condition="'$(OSGroup)'=='Linux'">ubuntu.14.04-x64</ObjectWriterNuPkgRid> - <ObjectWriterNuPkgRid Condition="'$(ObjectWriterNuPkgRid)'==''">$(NuPkgRid)</ObjectWriterNuPkgRid> - </PropertyGroup> - <ItemGroup> - <!-- IL.Compiler target files --> - <ILCompilerFiles Include="ilc.dll" /> - <ILCompilerFiles Include="ILCompiler.Compiler.dll" /> - <ILCompilerFiles Include="ILCompiler.CppCodeGen.dll" /> - <ILCompilerFiles Include="ILCompiler.DependencyAnalysisFramework.dll" /> - <ILCompilerFiles Include="ILCompiler.MetadataTransform.dll" /> - <ILCompilerFiles Include="ILCompiler.MetadataWriter.dll" /> - <ILCompilerFiles Include="ILCompiler.TypeSystem.dll" /> - <ILCompilerBinPlace Include="@(ILCompilerFiles)"> - <Text><![CDATA[ <file src="$(RelativeProductBinDir)/ILCompiler/%(Identity)" target="runtimes/any/lib/netcoreapp1.1/%(Identity)" /> ]]></Text> - </ILCompilerBinPlace> - - <ILCompilerNativeFiles Include="jitinterface.dll" Condition="'$(OSGroup)'=='Windows_NT'" /> - <ILCompilerNativeFiles Include="jitinterface.so" Condition="'$(OSGroup)'=='Linux'" /> - <ILCompilerNativeFiles Include="jitinterface.dylib" Condition="'$(OSGroup)'=='OSX'" /> - <ILCompilerBinPlace Include="@(ILCompilerNativeFiles)"> - <Text><![CDATA[ <file src="$(RelativeProductBinDir)/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Identity)" /> ]]></Text> - </ILCompilerBinPlace> - - <!-- Repackage the JIT dynamic library used for AOT compilation with ilc suffix to avoid colliding with the one used to run the toolchain --> - <!-- TODO: Publish the JIT dynamic library in a sub-directory under the original name instead? --> - <ILCompilerRepackageJitFiles Include="clrjit.dll" Condition="'$(OSGroup)'=='Windows_NT'" /> - <ILCompilerRepackageJitFiles Include="libclrjit.so" Condition="'$(OSGroup)'=='Linux'" /> - <ILCompilerRepackageJitFiles Include="libclrjit.dylib" Condition="'$(OSGroup)'=='OSX'" /> - <ILCompilerBinPlace Include="@(ILCompilerRepackageJitFiles)"> - <Text><![CDATA[ <file src="packages/runtime.$(JitNuPkgRid).Microsoft.NETCore.Jit/$(JitPackageVersion)/runtimes/$(JitNuPkgRid)/native/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Filename)ilc%(Extension)" /> ]]></Text> - </ILCompilerBinPlace> - - <!-- Repackage the ObjectWriter dynamic library to workaround missing Ubuntu 16.04 build --> - <!-- TODO: Publish the Ubuntu 16.04 build --> - <ILCompilerRepackageObjectWriterFiles Include="objwriter.dll" Condition="'$(OSGroup)'=='Windows_NT'" /> - <ILCompilerRepackageObjectWriterFiles Include="libobjwriter.so" Condition="'$(OSGroup)'=='Linux'" /> - <ILCompilerRepackageObjectWriterFiles Include="libobjwriter.dylib" Condition="'$(OSGroup)'=='OSX'" /> - <ILCompilerBinPlace Include="@(ILCompilerRepackageObjectWriterFiles)"> - <Text><![CDATA[ <file src="packages/toolchain.$(ObjectWriterNuPkgRid).Microsoft.DotNet.ObjectWriter/$(ObjectWriterPackageVersion)/runtimes/$(ObjectWriterNuPkgRid)/native/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Identity)" /> ]]></Text> - </ILCompilerBinPlace> - - <ILCompilerContentFiles Include="BuildIntegration/Microsoft.NETCore.Native.targets" /> - <ILCompilerContentFiles Include="BuildIntegration/Microsoft.NETCore.Native.Windows.props" /> - <ILCompilerContentFiles Include="BuildIntegration/Microsoft.NETCore.Native.Unix.props" /> - <ILCompilerBinPlace Include="@(ILCompilerContentFiles)"> - <Text><![CDATA[ <file src="src/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Filename)%(Extension)" /> ]]></Text> - </ILCompilerBinPlace> - - <!-- This is needed for VS Code debugging for ILC --> - <ILCompilerJsonContentFiles Include="ilc.runtimeconfig.json" /> - <ILCompilerBinPlace Include="@(ILCompilerJsonContentFiles)"> - <Text><![CDATA[ <file src="src/ILCompiler/src/%(Identity)" target="runtimes/$(NuPkgRid)/native/%(Filename)%(Extension)" /> ]]></Text> - </ILCompilerBinPlace> - - <!-- IL.Compiler.SDK target files --> - <ILCompilerSdkFiles Include="Runtime" /> - <ILCompilerSdkFiles Include="PortableRuntime" /> - <ILCompilerSdkFiles Include="bootstrapper" /> - <ILCompilerSdkFiles Include="bootstrappercpp" /> - <ILCompilerSdkFiles Include="System.Private.CoreLib.Native" Condition="'$(OsEnvironment)'!='Windows_NT'" /> - - <!-- ILCompiler.SDK Cpp Codegen support files --> - <ILCompilerSdkCppCodegenFiles Include="Native/Bootstrap/common.h" /> - <ILCompilerSdkCppCodegenFiles Include="Native/Bootstrap/CppCodeGen.h" /> - - <ILCompilerSdkFilesManaged Include="System.Private.CoreLib" /> - <ILCompilerSdkFilesManaged Include="System.Private.DeveloperExperience.Console" /> - <ILCompilerSdkFilesManaged Include="System.Private.Interop" /> - <ILCompilerSdkFilesManaged Include="System.Private.Reflection.Core" /> - <ILCompilerSdkFilesManaged Include="System.Private.Reflection.Execution" /> - <ILCompilerSdkFilesManaged Include="System.Private.Reflection.Metadata" /> - <ILCompilerSdkFilesManaged Include="System.Private.StackTraceGenerator" /> - <ILCompilerSdkFilesManaged Include="System.Private.Threading" /> - <ILCompilerSdkFilesManaged Include="System.Private.TypeLoader" /> - - <ILCompilerSdkBinPlace Include="@(ILCompilerSdkFiles)"> - <Text><![CDATA[ <file src="$(RelativeProductBinDir)/lib/$(LibPrefix)%(Identity).$(StaticLibExt)" target="runtimes/$(NuPkgRid)/native/sdk/$(LibPrefix)%(Identity).$(StaticLibExt)" /> ]]></Text> - </ILCompilerSdkBinPlace> - <ILCompilerSdkBinPlace Include="@(ILCompilerSdkFiles)" Condition="'$(OsEnvironment)'=='Windows_NT'"> - <Text><![CDATA[ <file src="$(RelativeProductBinDir)/lib/$(LibPrefix)%(Identity).pdb" target="runtimes/$(NuPkgRid)/native/sdk/$(LibPrefix)%(Identity).pdb" /> ]]></Text> - </ILCompilerSdkBinPlace> - - <ILCompilerSdkBinPlace Include="@(ILCompilerSdkFilesManaged)"> - <Text><![CDATA[ <file src="$(RelativeProductBinDir)/%(Identity)/%(Identity).dll" target="runtimes/$(NuPkgRid)/native/sdk/%(Identity).dll" /> ]]></Text> - </ILCompilerSdkBinPlace> - <ILCompilerSdkBinPlace Include="@(ILCompilerSdkCppCodegenFiles)"> - <Text><![CDATA[ <file src="src/%(Identity)" target="runtimes/$(NuPkgRid)/native/inc/%(Filename)%(Extension)" /> ]]></Text> - </ILCompilerSdkBinPlace> - - <!-- Repackage the CoreCLR framework --> - <!-- TODO: Obtain this via nuget once the framework is properly packaged --> - <ILCompilerAnyFrameworkFiles Include="Microsoft.Win32.Primitives" /> - <ILCompilerAnyFrameworkFiles Include="mscorlib" /> - <ILCompilerAnyFrameworkFiles Include="System.AppContext" /> - <ILCompilerAnyFrameworkFiles Include="System.Buffers" /> - <ILCompilerAnyFrameworkFiles Include="System.Collections" /> - <ILCompilerAnyFrameworkFiles Include="System.Collections.Concurrent" /> - <ILCompilerAnyFrameworkFiles Include="System.Collections.NonGeneric" /> - <ILCompilerAnyFrameworkFiles Include="System.Collections.Specialized" /> - <ILCompilerAnyFrameworkFiles Include="System.Console" /> - <ILCompilerAnyFrameworkFiles Include="System.Diagnostics.Debug" /> - <ILCompilerAnyFrameworkFiles Include="System.Diagnostics.Tools" /> - <ILCompilerAnyFrameworkFiles Include="System.Diagnostics.TraceSource" /> - <ILCompilerAnyFrameworkFiles Include="System.Diagnostics.Tracing" /> - <ILCompilerAnyFrameworkFiles Include="System.Globalization" /> - <ILCompilerAnyFrameworkFiles Include="System.Globalization.Calendars" /> - <ILCompilerAnyFrameworkFiles Include="System.IO" /> - <ILCompilerAnyFrameworkFiles Include="System.IO.FileSystem" /> - <ILCompilerAnyFrameworkFiles Include="System.IO.FileSystem.Primitives" /> - <ILCompilerAnyFrameworkFiles Include="System.Linq" /> - <ILCompilerAnyFrameworkFiles Include="System.Net.Primitives" /> - <ILCompilerAnyFrameworkFiles Include="System.Numerics.Vectors" /> - <ILCompilerAnyFrameworkFiles Include="System.ObjectModel" /> - <ILCompilerAnyFrameworkFiles Include="System.Private.Uri" /> - <ILCompilerAnyFrameworkFiles Include="System.Reflection" /> - <ILCompilerAnyFrameworkFiles Include="System.Reflection.Extensions" /> - <ILCompilerAnyFrameworkFiles Include="System.Reflection.TypeExtensions" /> - <ILCompilerAnyFrameworkFiles Include="System.Resources.ResourceManager" /> - <ILCompilerAnyFrameworkFiles Include="System.Runtime" /> - <ILCompilerAnyFrameworkFiles Include="System.Runtime.Extensions" /> - <ILCompilerAnyFrameworkFiles Include="System.Runtime.Handles" /> - <ILCompilerAnyFrameworkFiles Include="System.Runtime.InteropServices.RuntimeInformation" /> - <ILCompilerAnyFrameworkFiles Include="System.Runtime.Numerics" /> - <ILCompilerAnyFrameworkFiles Include="System.Security.Principal" /> - <ILCompilerAnyFrameworkFiles Include="System.Security.Cryptography.Algorithms" /> - <ILCompilerAnyFrameworkFiles Include="System.Security.Cryptography.Primitives" /> - <ILCompilerAnyFrameworkFiles Include="System.Security.Cryptography.Encoding" /> - <ILCompilerAnyFrameworkFiles Include="System.Text.Encoding" /> - <ILCompilerAnyFrameworkFiles Include="System.Text.Encoding.Extensions" /> - <ILCompilerAnyFrameworkFiles Include="System.Text.RegularExpressions" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Overlapped" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Tasks" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Tasks.Extensions" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Tasks.Parallel" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Thread" /> - <ILCompilerAnyFrameworkFiles Include="System.Threading.Timer" /> - <ILCompilerAnyFrameworkFiles Include="System.ValueTuple" /> - <ILCompilerSdkBinPlace Include="@(ILCompilerAnyFrameworkFiles)"> - <Text><![CDATA[ <file src="packages/runtime.$(CoreFxNuPkgRid).Microsoft.Private.CoreFx.NETCoreApp/$(CoreFxPackageVersion)/runtimes/$(CoreFxNuPkgRid)/lib/netcoreapp2.0/%(Identity).dll" target="runtimes/$(NuPkgRid)/native/framework/%(Identity).dll" /> ]]></Text> - </ILCompilerSdkBinPlace> - - <ILCompilerAotFrameworkFiles Include="System.Linq.Expressions" /> - <ILCompilerAotFrameworkFiles Include="System.Reflection.Primitives" /> - <ILCompilerAotFrameworkFiles Include="System.Runtime.InteropServices" /> - <ILCompilerSdkBinPlace Include="@(ILCompilerAotFrameworkFiles)"> - <Text><![CDATA[ <file src="packages/runtime.win10-x64-aot.Microsoft.Private.CoreFx.UAP/$(CoreFxPackageVersion)/runtimes/win10-x64-aot/lib/uap10.1/%(Identity).dll" target="runtimes/$(NuPkgRid)/native/framework/%(Identity).dll" /> ]]></Text> - </ILCompilerSdkBinPlace> - - <ILCompilerFrameworkFiles Include="System.Memory/$(CoreFxPackageVersion)/runtimes/win/lib/netcoreapp2.0/System.Memory.dll" /> - <ILCompilerFrameworkFiles Include="System.Runtime.CompilerServices.Unsafe/$(CoreFxPackageVersion)/lib/netstandard1.0/System.Runtime.CompilerServices.Unsafe.dll" /> - - <ILCompilerFrameworkFiles Include="runtime.$(CoreFxNuPkgRid).Microsoft.Private.CoreFx.NETCoreApp/$(CoreFxPackageVersion)/runtimes/$(CoreFxNuPkgRid)/native/System.Native.a" Condition="'$(OsEnvironment)'!='Windows_NT'" /> - <ILCompilerFrameworkFiles Include="runtime.$(NuPkgRid).Microsoft.NETCore.Native/$(MicrosoftNetCoreNativePackageVersion)/runtimes/$(NuPkgRid)/native/libSystem.Globalization.Native.a" Condition="'$(OsEnvironment)'!='Windows_NT'" /> - - <ILCompilerSdkBinPlace Include="@(ILCompilerFrameworkFiles)"> - <Text><![CDATA[ <file src="packages/%(Identity)" target="runtimes/$(NuPkgRid)/native/framework/%(Filename)%(Extension)" /> ]]></Text> - </ILCompilerSdkBinPlace> - - <!-- ILCompiler nuspec file --> - <NuSpecFile Include="$(ToolchainPackageName)"> - <Stage>1</Stage> - <Version>$(ToolchainVersion)</Version> - <Title>Microsoft .NET Native Toolchain</Title> - <Description>Provides the toolchain to compile managed code to native.</Description> - <Files>@(ILCompilerBinPlace -> '%(Text)', '')</Files> - <!-- TODO: Obtain this from project.lock.json --> - <Dependencies><![CDATA[ - <dependency id="NETStandard.Library" version="1.6.1" /> - <dependency id="System.Collections.Immutable" version="1.3.1" /> - <dependency id="System.IO.MemoryMappedFiles" version="4.3.0" /> - <dependency id="System.Reflection.Metadata" version="1.4.2" /> - <dependency id="System.Runtime.CompilerServices.Unsafe" version="4.3.0" /> - <dependency id="System.Xml.ReaderWriter" version="4.3.0" /> - <dependency id="Microsoft.DiaSymReader" version="1.1.0" /> - <dependency id="System.CommandLine" version="0.1.0-e160909-1" /> - ]]></Dependencies> - </NuSpecFile> - - <!-- ILCompiler.SDK nuspec file --> - <NuSpecFile Include="$(RuntimeSdkPackageName)"> - <Stage>1</Stage> - <Version>$(RuntimeSdkVersion)</Version> - <Title>Microsoft .NET Native Runtime SDK</Title> - <Description>Provides the runtime and link libraries to compile managed code to native.</Description> - <Files>@(ILCompilerSdkBinPlace -> '%(Text)', '')</Files> - <Dependencies><![CDATA[ - <dependency id="$(ToolchainPackageName)" version="$(ToolchainVersion)"/>]]> - </Dependencies> - </NuSpecFile> - - <!-- A pair of platform and runtime package info per nuspec file --> - <NuSpecFileGroup Include="@(NuSpecFile)"> - <Stage>%(Stage)</Stage> - <RedirPackage>%(Identity)</RedirPackage> - <Version>%(Version)</Version> - <PlatformPackage>toolchain.$(NuPkgRid).%(Identity)</PlatformPackage> - <NuSpecPackageMetadata><![CDATA[ - <version>%(Version)</version> - <title>%(Title)</title> - <authors>Microsoft</authors> - <owners>Microsoft</owners> - <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl> - <projectUrl>https://github.com/dotnet/corert</projectUrl> - <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl> - <requireLicenseAcceptance>true</requireLicenseAcceptance> - <description>%(Description)</description> - <releaseNotes>Initial release</releaseNotes> - <copyright>Copyright ©%3B Microsoft Corporation</copyright> - <dependencies> - %(Dependencies) - </dependencies>]]> - </NuSpecPackageMetadata> - <PlatformPkgFiles>%(Files)</PlatformPkgFiles> - </NuSpecFileGroup> - - <!-- NuSpecCollection: A collection of NuSpecFileGroup --> - <NuSpecCollection Include="@(NuSpecFileGroup)"> - <Stage>%(Stage)</Stage> - <RuntimeJsonFile>$(ProductPackageDir)/%(RedirPackage).runtime.json</RuntimeJsonFile> - <RuntimeJsonLines><![CDATA[ -{ - "runtimes": { - "win7-x64": { - "%(RedirPackage)": { - "toolchain.win7-x64.%(RedirPackage)": "%(Version)" - } - }, - "osx.10.10-x64": { - "%(RedirPackage)": { - "toolchain.osx.10.10-x64.%(RedirPackage)": "%(Version)" - } - }, - "ubuntu.14.04-x64": { - "%(RedirPackage)": { - "toolchain.ubuntu.14.04-x64.%(RedirPackage)": "%(Version)" - } - }, - "ubuntu.16.04-x64": { - "%(RedirPackage)": { - "toolchain.ubuntu.16.04-x64.%(RedirPackage)": "%(Version)" - } - } - } -}]]> - </RuntimeJsonLines> - <RedirFile>$(ProductPackageDir)/%(RedirPackage).nuspec</RedirFile> - <RedirLines><![CDATA[<package> - <metadata> - <id>%(RedirPackage)</id> - %(NuSpecPackageMetadata) - </metadata> - <files> - <file src="$(RelativeProductBinDir)/packaging/%(RedirPackage).runtime.json" target="runtime.json"></file> - </files> -</package> -]]> - </RedirLines> - <PlatformFile>$(ProductPackageDir)/%(PlatformPackage).nuspec</PlatformFile> - <PlatformLines><![CDATA[<package> - <metadata> - <id>%(PlatformPackage)</id> - %(NuSpecPackageMetadata) - </metadata> - <files> - %(PlatformPkgFiles) - </files> -</package> -]]> - </PlatformLines> - </NuSpecCollection> - </ItemGroup> - - <!-- Recreate the package dir --> - <RemoveDir Directories="$(ProductPackageDir)" /> - <MakeDir Directories="$(ProductPackageDir)" Condition="!Exists('$(ProductPackageDir)')" /> - - <!-- =================== stage1 ==================== --> - <!-- Write the runtime.json redirection package and the runtime platform file --> - <WriteLinesToFile File="%(NuSpecCollection.RuntimeJsonFile)" Lines="%(NuSpecCollection.RuntimeJsonLines)" Overwrite="true" Condition="'%(NuSpecCollection.Stage)'=='1'" /> - <WriteLinesToFile File="%(NuSpecCollection.PlatformFile)" Lines="%(NuSpecCollection.PlatformLines)" Overwrite="true" Condition="'%(NuSpecCollection.Stage)'=='1'" /> - <WriteLinesToFile File="%(NuSpecCollection.RedirFile)" Lines="%(NuSpecCollection.RedirLines)" Overwrite="true" Condition="'%(NuSpecCollection.Stage)'=='1'" /> - - <ItemGroup> - <Stage1NuSpecs Include="%(NuSpecCollection.PlatformFile)" Condition="'%(NuSpecCollection.Stage)'=='1'" /> - <Stage1NuSpecs Include="%(NuSpecCollection.RedirFile)" Condition="'%(NuSpecCollection.Stage)'=='1'" /> - </ItemGroup> - - <NugetPack Nuspecs="%(Stage1NuSpecs.Identity)" OutputDirectory="$(ProductPackageDir)" BaseDirectory="$(RepoPath)" /> - - <PropertyGroup> - <Stage1ProjectDir>$(ProductPackageDir)stage1/</Stage1ProjectDir> - <Stage1PublishDir>$(ProductPackageDir)publish1/</Stage1PublishDir> - <Stage1ProjectJsonFile>$(Stage1ProjectDir)project.json</Stage1ProjectJsonFile> - <Stage1ProjectJsonLines><![CDATA[ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0", - "Microsoft.NETCore.TestHost": "1.1.0", - "toolchain.$(NuPkgRid).$(RuntimeSdkPackageName)": "$(RuntimeSdkVersion)", - }, - - "frameworks": { - "netcoreapp1.1": { } - }, - - "runtimes": { - "$(NuPkgRid)": {}, - } -}]]> - </Stage1ProjectJsonLines> - </PropertyGroup> - <MakeDir Directories="$(Stage1ProjectDir)" Condition="!Exists('$(Stage1ProjectDir)')" /> - <WriteLinesToFile File="$(Stage1ProjectJsonFile)" Lines="$(Stage1ProjectJsonLines)" Overwrite="true" /> - <WriteLinesToFile File="$(Stage1ProjectDir)/Program.cs" Lines="class Program { public static void Main() { } }" Overwrite="true" /> - <Exec Command=""$(DnuToolPath)" restore -s "$(ProductPackageDir)" $(DnuRestoreSource) "$(Stage1ProjectDir)"" /> - <Exec Command=""$(DnuToolPath)" publish "$(Stage1ProjectDir)" --native-subdirectory -o "$(Stage1PublishDir)" -f "netcoreapp1.1" --runtime "$(NuPkgRid)"" /> - - </Target> -</Project> diff --git a/src/packaging/ryujit/project.json b/src/packaging/ryujit/project.json deleted file mode 100644 index 62e1aa26b..000000000 --- a/src/packaging/ryujit/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Jit": "2.1.0-preview1-25412-03" - }, - "frameworks": { - "netcoreapp2.0": { } - }, - "runtimes": { - "win-x64": { }, - "osx-x64": { }, - "linux-x64": { } - } -} diff --git a/src/packaging/uap/project.json b/src/packaging/uap/project.json deleted file mode 100644 index 1ca2fa5dd..000000000 --- a/src/packaging/uap/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameworks": { - "uap10.1": { - "dependencies": { - "runtime.win10-x64-aot.Microsoft.Private.CoreFx.UAP": "4.5.0-preview1-25417-02" - } - } - }, - - "runtimes": { - "win10-x64-aot": {}, - } -} diff --git a/tests/CoreCLR/Test.csproj b/tests/CoreCLR/Test.csproj index a2a833d5e..5447b5748 100644 --- a/tests/CoreCLR/Test.csproj +++ b/tests/CoreCLR/Test.csproj @@ -1,4 +1,4 @@ -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="LinkNative" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <TargetName>$(TestFileName)</TargetName> @@ -12,9 +12,10 @@ <!-- Some tests consist of multiple assemblies - make sure ILC sees them --> <IlcCompileInput Include="$(MSBuildProjectDirectory)\*.dll" /> </ItemGroup> - - <Import Project="$(CoreRT_TestRoot)\Test.Common.targets" /> - + <!-- Since tests are already compiled, override Compile target to prevent CSC running --> <Target Name="Compile" /> + + <Import Project="$(IlcPath)\build\Microsoft.NETCore.Native.targets" /> + </Project> diff --git a/tests/CoreCLR/build-and-run-test.cmd b/tests/CoreCLR/build-and-run-test.cmd index ea1710899..2824edd9d 100644 --- a/tests/CoreCLR/build-and-run-test.cmd +++ b/tests/CoreCLR/build-and-run-test.cmd @@ -21,13 +21,6 @@ set TestFileName=%~n2 copy /Y %~dp0\Test.csproj %TestFolder% :: -:: Clear Core_Root before invoking MSBuild. This is important, because we need it set to the CoreCLR -:: test payload's CoreCLR folder while running the test infrastructure, but when msbuild launches -:: the CoreRT CoreCLR to run ILC.exe, Core_Root affects the binder and we probe for assemblies in -:: the wrong place. -set CORE_ROOT= - -:: :: The CoreCLR test system configures the VS environment as 32-bit by default, :: so override if we're doing a 64-bit test run :: diff --git a/tests/CoreCLR/runtest/dir.props b/tests/CoreCLR/runtest/dir.props index 2a0932ba8..a47212090 100644 --- a/tests/CoreCLR/runtest/dir.props +++ b/tests/CoreCLR/runtest/dir.props @@ -13,14 +13,6 @@ <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 runnning the build on mono. Until we can get these sorted out we will continue using the .NET 4.5 version of the tasks. - --> - <PropertyGroup> - <BuildToolsTargetsDesktop>true</BuildToolsTargetsDesktop> - </PropertyGroup> - <!-- Common repo directories --> <PropertyGroup> <CopyNuGetImplementations Condition="'$(CopyNuGetImplementations)'==''">false</CopyNuGetImplementations> @@ -29,41 +21,18 @@ <PackagesDir>$(ProjectDir)..\..\..\packages\</PackagesDir> <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)..\Tools\</ToolsDir> <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/</DotnetCliPath> - <BuildToolsTaskDir Condition="'$(BuildToolsTargetsDesktop)' == 'true'">$(ToolsDir)net46/</BuildToolsTaskDir> <SkipImportILTargets>true</SkipImportILTargets> </PropertyGroup> <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. --> <Import Project="$(MSBuildThisFileDirectory)\..\dependencies.props" /> - <!-- Common nuget properties --> - <PropertyGroup> - <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath> - <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile> - <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine> - - <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand> - <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on - the path. --> - <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand> - <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand> - </PropertyGroup> - - <!-- list of nuget package sources passed to dnu --> - <ItemGroup> - <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> - </ItemGroup> - - - <!-- list of directories to perform batch restore --> - <ItemGroup> - <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> - </ItemGroup> + <!-- list of nuget package sources passed to dnu --> + <ItemGroup> + <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> + </ItemGroup> <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/CoreCLR/runtest/runtest.cmd b/tests/CoreCLR/runtest/runtest.cmd index fafbe7482..f89a6fced 100644 --- a/tests/CoreCLR/runtest/runtest.cmd +++ b/tests/CoreCLR/runtest/runtest.cmd @@ -192,11 +192,6 @@ if defined __GenerateLayoutOnly ( exit /b 1 ) -if not exist %CORE_ROOT%\coreclr.dll ( - echo %__MsgPrefix%Error: Ensure you have done a successful build of the Product and %CORE_ROOT% contains runtime binaries. - exit /b 1 -) - ::Check if the test Binaries are built if not exist %XunitTestBinBase% ( echo %__MsgPrefix%Error: Ensure the Test Binaries are built and are present at %XunitTestBinBase%. diff --git a/tests/CoreCLR/runtest/runtest.proj b/tests/CoreCLR/runtest/runtest.proj index df4a50b28..2a9902d82 100644 --- a/tests/CoreCLR/runtest/runtest.proj +++ b/tests/CoreCLR/runtest/runtest.proj @@ -72,22 +72,16 @@ $(_XunitEpilog) <Configuration Condition=" '%24(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '%24(Platform)' == '' ">AnyCPU</Platform> <AssemblyName>$(XunitWrapper)</AssemblyName> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid> <OutputType>Library</OutputType> <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <TargetFramework>net45</TargetFramework> <IsXunitWrapperProject>true</IsXunitWrapperProject> <SkipSigning>true</SkipSigning> - <AppDesignerFolder>Properties</AppDesignerFolder> - <FileAlignment>512</FileAlignment> - <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> <CLRTestKind>BuildOnly</CLRTestKind> <IsTestProject>true</IsTestProject> - <ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson> - <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson> + <RestoreOutputPath>%24(IntermediateOutputRootPath)\XUnitTooling</RestoreOutputPath> <ReferencePath>$(ReferencePath);$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper</ReferencePath> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -108,13 +102,13 @@ $(_XunitEpilog) <Reference Include="mscorlib" /> <Reference Include="$(XunitTestBinBase)\Common\Desktop.Coreclr.TestWrapper\Desktop.Coreclr.TestWrapper\Coreclr.TestWrapper.dll" /> </ItemGroup> + <Import Project="$(SourceDir)dir.targets" /> <PropertyGroup> - <ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson> - <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson> + <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir> </PropertyGroup> - <Import Project="$(SourceDir)dir.targets" /> <PropertyGroup> - <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir> + <_TargetFrameworkDirectories /> + <_FullFrameworkReferenceAssemblyPaths /> </PropertyGroup> </Project> ]]> diff --git a/tests/CoreCLR/runtest/runtest.sh b/tests/CoreCLR/runtest/runtest.sh index d5f672417..bb8fd1eb5 100755 --- a/tests/CoreCLR/runtest/runtest.sh +++ b/tests/CoreCLR/runtest/runtest.sh @@ -209,8 +209,7 @@ function xunit_output_end { ((errorCount = 1)) fi - echo '<?xml version="1.0" encoding="utf-8"?>' >>"$xunitOutputPath" - echo '<assemblies>' >>"$xunitOutputPath" + echo '<assemblies>' >"$xunitOutputPath" local line diff --git a/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj b/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj index 01fc23243..701486648 100644 --- a/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj +++ b/tests/CoreCLR/runtest/src/TestWrappersConfig/XUnitTooling.depproj @@ -1,22 +1,23 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build"> <Import Project="..\..\..\..\..\dir.props" /> <PropertyGroup> - <AssemblyVersion>4.0.0.0</AssemblyVersion> - <OutputType>Library</OutputType> - <OutputPath>$(AotPackageReferencePath)</OutputPath> - <ResolvePackages>true</ResolvePackages> - <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages> - <ProjectJson>project.json</ProjectJson> - <ProjectLockJson>project.lock.json</ProjectLockJson> + <TargetFramework>net45</TargetFramework> + <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion> </PropertyGroup> <ItemGroup> - <None Include="project.json" /> + <PackageReference Include="xunit"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.assert"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.core"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> + <PackageReference Include="xunit.runner.msbuild"> + <Version>$(XunitPackageVersion)</Version> + </PackageReference> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - - <PropertyGroup> - <NuGetTargetMoniker>.NETCore,Version=v5.0</NuGetTargetMoniker> - <NuGetRuntimeIdentifier>win8-aot</NuGetRuntimeIdentifier> - </PropertyGroup> </Project> diff --git a/tests/CoreCLR/runtest/src/TestWrappersConfig/project.json b/tests/CoreCLR/runtest/src/TestWrappersConfig/project.json deleted file mode 100644 index b9534119a..000000000 --- a/tests/CoreCLR/runtest/src/TestWrappersConfig/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "dependencies": { - "xunit": "2.2.0-beta2-build3300", - "xunit.assert": "2.2.0-beta2-build3300", - "xunit.core": "2.2.0-beta2-build3300", - "xunit.runner.msbuild": "2.2.0-beta2-build3300" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ] - }, - "net45": { - "imports": "portable-net45+win8" - } - }, - "runtimes": { - "win7-x86": {}, - "win7-x64": {}, - "ubuntu.14.04-x64": {}, - "osx.10.10-x64": {}, - "centos.7-x64": {}, - "rhel.7-x64": {}, - "debian.8-x64": {} - } -} diff --git a/tests/CoreCLR/runtest/src/dir.props b/tests/CoreCLR/runtest/src/dir.props index 297d6f9b9..5a67e6a83 100644 --- a/tests/CoreCLR/runtest/src/dir.props +++ b/tests/CoreCLR/runtest/src/dir.props @@ -11,8 +11,6 @@ <NoWarn>78,162,164,168,169,219,251,252,414,429,642,649,652,675,1691,1717,1718,3001,3002,3003,3005,3008</NoWarn> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <SkipSigning Condition="'$(CrossGen)' == 'true'">true</SkipSigning> - <!-- Set the project.json directory for generated TestWrappers. --> - <TestWrappersPackagesConfigFileDirectory>$(MSBuildThisFileDirectory)TestWrappersConfig\</TestWrappersPackagesConfigFileDirectory> </PropertyGroup> <!-- Expose the target OS in a more convenient fashion --> @@ -81,9 +79,4 @@ <PropertyGroup> <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire> </PropertyGroup> - - <PropertyGroup> - <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson> - </PropertyGroup> </Project> diff --git a/tests/CoreCLR/runtest/src/dir.targets b/tests/CoreCLR/runtest/src/dir.targets index 03e16ab54..a767ae9ae 100644 --- a/tests/CoreCLR/runtest/src/dir.targets +++ b/tests/CoreCLR/runtest/src/dir.targets @@ -50,11 +50,6 @@ <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun> </PropertyGroup> - <PropertyGroup Condition="'$(ReferenceLocalMscorlib)' == 'true'"> - <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson> - <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson> - </PropertyGroup> - <!-- If it needs ProjectToRun, turn the project into a ProjectReference so it gets built --> @@ -63,11 +58,7 @@ <Private>false</Private> </ProjectReference> </ItemGroup> - - <PropertyGroup> - <ErrorIfBuildToolsRestoredFromIndividualProject Condition="!Exists('$(ToolsDir)')">true</ErrorIfBuildToolsRestoredFromIndividualProject> - </PropertyGroup> - + <Import Project="..\dir.targets" /> <Target Name="CreateManifestResourceNames" /> diff --git a/tests/CoreCLR/runtest/xunitwrapper.targets b/tests/CoreCLR/runtest/xunitwrapper.targets index b7792c335..655fc0429 100644 --- a/tests/CoreCLR/runtest/xunitwrapper.targets +++ b/tests/CoreCLR/runtest/xunitwrapper.targets @@ -5,13 +5,13 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Target Name="ResolveNuGetPackages"> - <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))" + <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectAssetsFile))" AllowFallbackOnTargetSelection="true" IncludeFrameworkReferences="false" NuGetPackagesDirectory="$(PackagesDir)" RuntimeIdentifier="$(TestNugetRuntimeId)" ProjectLanguage="$(Language)" - ProjectLockFile="$(ProjectLockJson)" + ProjectLockFile="$(ProjectAssetsFile)" TargetMonikers="$(TargetFrameworkMoniker)"> <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" /> <Output TaskParameter="ResolvedReferences" ItemName="Reference" /> diff --git a/tests/Test.Common.targets b/tests/Test.Common.targets deleted file mode 100644 index 33d7b87b3..000000000 --- a/tests/Test.Common.targets +++ /dev/null @@ -1,13 +0,0 @@ -<Project DefaultTargets="LinkNative" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - - <PropertyGroup> - <CopyNuGetImplementations>false</CopyNuGetImplementations> - <GenerateAssemblyInfo>false</GenerateAssemblyInfo> - <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> - </PropertyGroup> - - <!-- Use the source primary copy for development convenience --> - <Import Project="$(MSBuildThisFileDirectory)\..\src\BuildIntegration\Microsoft.NETCore.Native.targets" /> - <!-- <Import Project="$(IlcPath)\Microsoft.NETCore.Native.targets" /> --> -</Project> diff --git a/tests/runtest.cmd b/tests/runtest.cmd index 762b24bcf..e83ae5e6a 100644 --- a/tests/runtest.cmd +++ b/tests/runtest.cmd @@ -1,4 +1,4 @@ -@echo off +@if not defined _echo @echo off setlocal EnableDelayedExpansion set ThisScript=%0 @@ -125,6 +125,7 @@ if /i "%__BuildType%"=="Debug" ( set __LinkLibs=msvcrt.lib ) +if not exist "!__CoreRTTestBinDir!" (mkdir !__CoreRTTestBinDir!) echo. > %__CoreRTTestBinDir%\testResults.tmp set /a __CppTotalTests=0 @@ -163,8 +164,7 @@ set /a __TotalTests=%__JitTotalTests%+%__CppTotalTests% set /a __PassedTests=%__JitPassedTests%+%__CppPassedTests% set /a __FailedTests=%__JitFailedTests%+%__CppFailedTests% -echo ^<?xml version="1.0" encoding="utf-8"?^> > %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% -echo ^<assemblies^> >> %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% +echo ^<assemblies^> > %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% echo ^<assembly name="ILCompiler" total="%__TotalTests%" passed="%__PassedTests%" failed="%__FailedTests%" skipped="0"^> >> %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% echo ^<collection total="%__TotalTests%" passed="%__PassedTests%" failed="%__FailedTests%" skipped="0"^> >> %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% type %__CoreRTTestBinDir%\testResults.tmp >> %__CoreRTTestBinDir%\%CoreRT_TestLogFileName% @@ -233,9 +233,9 @@ goto :eof ) ) - echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" !extraArgs! !__SourceFileProj! + echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" !extraArgs! !__SourceFileProj! echo. - msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" !extraArgs! !__SourceFileProj! + msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%~dp0..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" !extraArgs! !__SourceFileProj! endlocal set __SavedErrorLevel=%ErrorLevel% @@ -320,18 +320,16 @@ goto :eof set IlcMultiModule=true REM Pre-compile shared framework assembly echo Compiling framework library - echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%CoreRT_TestRoot%..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /t:CreateLib %CoreRT_TestRoot%\..\src\BuildIntegration\BuildFrameworkNativeObjects.proj - msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%CoreRT_TestRoot%..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /t:CreateLib %CoreRT_TestRoot%\..\src\BuildIntegration\BuildFrameworkNativeObjects.proj + echo msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%CoreRT_TestRoot%..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /t:CreateLib %CoreRT_TestRoot%\..\src\BuildIntegration\BuildFrameworkNativeObjects.proj + msbuild /m /ConsoleLoggerParameters:ForceNoAlign "/p:IlcPath=%CoreRT_ToolchainDir%" "/p:Configuration=%CoreRT_BuildType%" "/p:Platform=%CoreRT_BuildArch%" "/p:RepoLocalBuild=true" "/p:FrameworkLibPath=%CoreRT_TestRoot%..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\lib" "/p:FrameworkObjPath=%~dp0..\bin\obj\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\Framework" /t:CreateLib %CoreRT_TestRoot%\..\src\BuildIntegration\BuildFrameworkNativeObjects.proj ) echo. set CLRCustomTestLauncher=%CoreRT_TestRoot%\CoreCLR\build-and-run-test.cmd set XunitTestBinBase=!CoreRT_TestExtRepo! - set CORE_ROOT=%CoreRT_TestRoot%\..\Tools\dotnetcli\shared\Microsoft.NETCore.App\1.0.0 - echo CORE_ROOT IS NOW %CORE_ROOT% pushd %CoreRT_TestRoot%\CoreCLR\runtest - - msbuild "/p:RepoLocalBuild=true" src\TestWrappersConfig\XUnitTooling.depproj + + "%CoreRT_CliDir%\dotnet.exe" msbuild /t:Restore /p:RepoLocalBuild=true src\TestWrappersConfig\XUnitTooling.depproj if errorlevel 1 ( exit /b 1 ) diff --git a/tests/runtest.sh b/tests/runtest.sh index b315747d5..2c7dc1a20 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -55,8 +55,8 @@ run_test_dir() local __msbuild_dir=${CoreRT_TestRoot}/../Tools - echo ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/Product/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj - ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/Product/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj + echo ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj + ${__msbuild_dir}/dotnetcli/dotnet ${__msbuild_dir}/MSBuild.dll /ds /m /p:IlcPath=${CoreRT_ToolchainDir} /p:Configuration=${CoreRT_BuildType} /p:Platform=${CoreRT_BuildArch} /p:RepoLocalBuild=true "/p:FrameworkLibPath=${CoreRT_TestRoot}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/lib" "/p:FrameworkObjPath=${CoreRT_TestRoot}/../bin/obj/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/Framework" ${__extra_args} "${__extra_cxxflags}" "${__extra_linkflags}" ${__dir_path}/${__filename}.csproj local __exitcode=$? @@ -135,7 +135,6 @@ run_coreclr_tests() fi XunitTestBinBase=${CoreRT_TestExtRepo} - CORE_ROOT=${CoreRT_TestRoot}/CoreCLR/runtest pushd ${CoreRT_TestRoot}/CoreCLR/runtest export CoreRT_TestRoot @@ -321,6 +320,10 @@ __CppPassedTests=0 __JitTotalTests=0 __JitPassedTests=0 + +if [ ! -d ${__CoreRTTestBinDir} ]; then + mkdir -p ${__CoreRTTestBinDir} +fi echo > ${__CoreRTTestBinDir}/testResults.tmp __BuildOsLowcase=$(echo "${CoreRT_BuildOS}" | tr '[:upper:]' '[:lower:]') @@ -352,8 +355,7 @@ else __TestResultsLog=${__CoreRTTestBinDir}/testResults.xml fi -echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>" > ${__TestResultsLog} -echo "<assemblies>" >> ${__TestResultsLog} +echo "<assemblies>" > ${__TestResultsLog} echo "<assembly name=\"ILCompiler\" total=\"${__TotalTests}\" passed=\"${__PassedTests}\" failed=\"${__FailedTests}\" skipped=\"0\">" >> ${__TestResultsLog} echo "<collection total=\"${__TotalTests}\" passed=\"${__PassedTests}\" failed=\"${__FailedTests}\" skipped=\"0\">" >> ${__TestResultsLog} cat "${__CoreRTTestBinDir}/testResults.tmp" >> ${__TestResultsLog} diff --git a/tests/src/Simple/PreInitData/PreInitDataTest.il b/tests/src/Simple/PreInitData/PreInitDataTest.il index 1c946f495..2298c63c8 100644 --- a/tests/src/Simple/PreInitData/PreInitDataTest.il +++ b/tests/src/Simple/PreInitData/PreInitDataTest.il @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 -// Copyright (c) Microsoft Corporation. All rights reserved. - .assembly extern mscorlib { .publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4.. diff --git a/tests/src/Simple/SimpleTest.targets b/tests/src/Simple/SimpleTest.targets index ec00dc966..9cb77191f 100644 --- a/tests/src/Simple/SimpleTest.targets +++ b/tests/src/Simple/SimpleTest.targets @@ -8,12 +8,22 @@ </PropertyGroup> <PropertyGroup> - <ProjectJson>$(MSBuildThisFileDirectory)\project.json</ProjectJson> - <ProjectLockJson>$(MSBuildThisFileDirectory)\project.lock.json</ProjectLockJson> <CopyNuGetImplementations>false</CopyNuGetImplementations> <GenerateAssemblyInfo>false</GenerateAssemblyInfo> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <NuGetTargetMoniker>.NETStandard,Version=v1.6</NuGetTargetMoniker> + <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier> + <TargetFramework>netcoreapp2.0</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.NETCore.App"> + <Version>$(MicrosoftNETCoreAppPackageVersion)</Version> + </PackageReference> + </ItemGroup> + + <!-- Reuse restored assets from the repro project --> + <PropertyGroup> + <RestoreOutputPath>$(IntermediateOutputRootPath)\repro</RestoreOutputPath> </PropertyGroup> <!-- @@ -33,8 +43,7 @@ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> - <!-- Use the source primary copy for development convenience --> - <Import Project="$(MSBuildThisFileDirectory)\..\..\Test.Common.targets" /> + <Import Project="$(IlcPath)\build\Microsoft.NETCore.Native.targets" /> <ItemGroup> <CustomLinkerArg Include="$(AdditionalLinkerFlags)" /> diff --git a/tests/src/Simple/project.json b/tests/src/Simple/project.json deleted file mode 100644 index 59dba3394..000000000 --- a/tests/src/Simple/project.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Threading.Thread": "4.4.0-beta-24906-01" - }, - "frameworks": { - "netstandard1.6": {} - } -} diff --git a/tests/testenv.cmd b/tests/testenv.cmd index dd797b893..8d28fda44 100644 --- a/tests/testenv.cmd +++ b/tests/testenv.cmd @@ -1,4 +1,4 @@ -@echo off +@if not defined _echo @echo off :Arg_Loop if "%1" == "" goto :ArgsDone @@ -16,7 +16,7 @@ if /i "%1" == "release" (set CoreRT_BuildType=Release&shift&goto Arg_Loop) set CoreRT_BuildOS=Windows_NT -set CoreRT_ToolchainDir=%~dp0\..\bin\Product\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType%\packaging\publish1 +set CoreRT_ToolchainDir=%~dp0\..\bin\%CoreRT_BuildOS%.%CoreRT_BuildArch%.%CoreRT_BuildType% exit /b 0 diff --git a/tests/testenv.sh b/tests/testenv.sh index f324fba42..69a636bca 100755 --- a/tests/testenv.sh +++ b/tests/testenv.sh @@ -87,4 +87,4 @@ export CoreRT_BuildOS __ScriptDir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -export CoreRT_ToolchainDir=${__ScriptDir}/../bin/Product/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType}/packaging/publish1 +export CoreRT_ToolchainDir=${__ScriptDir}/../bin/${CoreRT_BuildOS}.${CoreRT_BuildArch}.${CoreRT_BuildType} |