diff --git a/Directory.Build.props b/Directory.Build.props index de3b3948d230..6dc7c80c2583 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,19 +1,41 @@ + + + + + + + + + + + + + + + + + + - $(MSBuildThisFileDirectory)/artifacts/bin/$(BuildOS)/ + $(MSBuildThisFileDirectory)/artifacts/Product/$(BuildOS)/ + $(RootArtifactsDir)obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/ false $(MSBuildThisFileDirectory)artifacts\toolset\Common\ + - + + unused + @@ -28,8 +50,117 @@ $(NumberOfCores) + strict + + + + + + 8.0 + true + + + + + + Portable + true + + + + + coreclr + + $(ProjectDir).dotnet\ + + + $(DotnetCliPath)/dotnet restore + true + + $(DotnetCliPath)dotnet + $(ToolsDir)Microsoft.DotNet.Build.Tasks.dll + + + true + + true + + + + + $(RootArtifactsDir)obj/$(BuildOS)/$(BuildArch)/$(BuildType)/$(MSBuildProjectName)/ + $(BinDir) + + + + + + + + https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT + $(SourceDir).nuget/descriptions.json + $(ProjectDir)LICENSE.TXT + $(ProjectDir)THIRD-PARTY-NOTICES.TXT + $(BaseIntermediateOutputPath) + + + + + true + + + 3.0.0-preview.19073.11 + $(PackagesDir)/microsoft.netcore.platforms/$(RuntimeIdGraphDefinitionVersion)/runtime.json + + + https://go.microsoft.com/fwlink/?LinkID=799421 + + https://dot.net + + + $(ToolsDir)net46/ + + $(Platform) + x64 + win7 + win8 + win10 + + true + + + true + true + x64 + x86 + x64 + + $(PackagesBinDir)/pkg/ + $(PackagesBinDir)/symbolpkg/ + $(MSBuildThisFileDirectory)/src/.nuget/packageIndex.json + + + true + + + + + + true + + + true + + + + + diff --git a/build.cmd b/build.cmd index 3617b1b48a0e..67361e00d059 100644 --- a/build.cmd +++ b/build.cmd @@ -32,7 +32,7 @@ set ghprbCommentBody= :: __BuildArch -- default: x64 :: __BuildType -- default: Debug :: __BuildOS -- default: Windows_NT -:: __ProjectDir -- default: directory of the dir.props file +:: __ProjectDir -- default: directory of the Directory.Build.Props file :: __SourceDir -- default: %__ProjectDir%\src\ :: __PackagesDir -- default: %__ProjectDir%\packages\ :: __RootBinDir -- default: %__ProjectDir%\bin\ diff --git a/build.proj b/build.proj index aecce3759c5f..aca36aa7abd2 100644 --- a/build.proj +++ b/build.proj @@ -1,6 +1,4 @@ - - @@ -40,8 +38,8 @@ - - + + diff --git a/build.sh b/build.sh index 473f09d5d4ce..cf3ed7e1a13d 100755 --- a/build.sh +++ b/build.sh @@ -86,7 +86,7 @@ setup_dirs() { echo Setting up directories for build - mkdir -p "$__RootBinDir" + mkdir -p "$__RootArtifactsDir" mkdir -p "$__BinDir" mkdir -p "$__LogsDir" mkdir -p "$__MsbuildDebugLogsDir" @@ -442,7 +442,7 @@ build_CoreLib() /p:UsePartialNGENOptimization=false /maxcpucount \ $__ProjectDir/build.proj \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackage=false \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootArtifactsDir=$__RootArtifactsDir /p:BuildNugetPackage=false \ $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then @@ -505,7 +505,7 @@ generate_NugetPackages() /p:UsePartialNGENOptimization=false /maxcpucount \ $__SourceDir/.nuget/packages.builds \ /flp:Verbosity=normal\;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackages=false /p:__DoCrossArchBuild=$__CrossBuild \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootArtifactsDir=$__RootArtifactsDir /p:BuildNugetPackages=false /p:__DoCrossArchBuild=$__CrossBuild \ $__CommonMSBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then @@ -615,8 +615,8 @@ __IgnoreWarnings=0 export __ProjectDir="$__ProjectRoot" export ArcadeBuild="true" __SourceDir="$__ProjectDir/src" -__PackagesDir="${DotNetRestorePackagesPath:-${__ProjectDir}/packages}" -__RootBinDir="$__ProjectDir/artifacts" +__PackagesDir="${DotNetRestorePackagesPath:-${HOME}/.nuget/packages/}" +__RootArtifactsDir="$__ProjectDir/artifacts/" __UnprocessedBuildArgs= __CommonMSBuildArgs= __MSBCleanBuildArgs= @@ -637,7 +637,6 @@ __SkipRestoreOptData=0 __SkipCrossgen=0 __CrossgenOnly=0 __PartialNgen=0 -__SkipTests=0 __CrossBuild=0 __ClangMajorVersion=0 __ClangMinorVersion=0 @@ -868,10 +867,6 @@ while :; do __PartialNgen=1 ;; - skiptests|-skiptests) - __SkipTests=1 - ;; - skipnuget|-skipnuget|skipbuildpackages|-skipbuildpackages) __SkipNuget=1 ;; @@ -893,13 +888,13 @@ while :; do bindir|-bindir) if [ -n "$2" ]; then - __RootBinDir="$2" - if [ ! -d $__RootBinDir ]; then - mkdir $__RootBinDir + __RootArtifactsDir="$2" + if [ ! -d $__RootArtifactsDir ]; then + mkdir $__RootArtifactsDir fi - __RootBinParent=$(dirname $__RootBinDir) - __RootBinName=${__RootBinDir##*/} - __RootBinDir="$(cd $__RootBinParent &>/dev/null && printf %s/%s $PWD $__RootBinName)" + __RootBinParent=$(dirname $__RootArtifactsDir) + __RootBinName=${__RootArtifactsDir##*/} + __RootArtifactsDir="$(cd $__RootBinParent &>/dev/null && printf %s/%s $PWD $__RootBinName)" shift else echo "ERROR: 'bindir' requires a non-empty option argument" @@ -990,16 +985,16 @@ if [ $__PortableBuild == 0 ]; then fi # Set dependent variables -__LogsDir="$__RootBinDir/Logs" +__LogsDir="$__RootArtifactsDir/log/${__BuildType}" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" # Set the remaining variables based upon the determined build configuration -__BinDir="$__RootBinDir/bin/${__BuildOS}/${__BuildArch}/${__BuildType}" +__BinDir="$__RootArtifactsDir/Product/${__BuildOS}/${__BuildArch}/${__BuildType}" __PackagesBinDir="$__BinDir/.nuget" -__ToolsDir="$__RootBinDir/tools" -__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" -export __IntermediatesDir="$__RootBinDir/obj/${__BuildOS}/${__BuildArch}/${__BuildType}" -__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" +__ToolsDir="$__RootArtifactsDir/tools" +__TestWorkingDir="$__RootArtifactsDir/tests/$__BuildOS.$__BuildArch.$__BuildType" +export __IntermediatesDir="$__RootArtifactsDir/obj/${__BuildOS}/${__BuildArch}/${__BuildType}" +__TestIntermediatesDir="$__RootArtifactsDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" @@ -1055,12 +1050,6 @@ generate_event_logging # Build the coreclr (native) components. __ExtraCmakeArgs="-DCLR_CMAKE_TARGET_OS=$__BuildOS -DCLR_CMAKE_PACKAGES_DIR=$__PackagesDir -DCLR_CMAKE_PGO_INSTRUMENT=$__PgoInstrument -DCLR_CMAKE_OPTDATA_VERSION=$__PgoOptDataVersion -DCLR_CMAKE_PGO_OPTIMIZE=$__PgoOptimize" -# [TODO] Remove this when the `build-test.sh` script properly builds and deploys test assets. -if [ $__SkipTests != 1 ]; then - echo "Adding CMake flags to build native tests for $__BuildOS.$__BuildArch.$__BuildType" - __ExtraCmakeArgs="$__ExtraCmakeArgs -DCLR_CMAKE_BUILD_TESTS=ON" -fi - build_native $__SkipCoreCLR "$__BuildArch" "$__IntermediatesDir" "$__ExtraCmakeArgs" "CoreCLR component" # Build cross-architecture components diff --git a/clrdefinitions.cmake b/clrdefinitions.cmake index 9e22da2033f0..535b6341ae9c 100644 --- a/clrdefinitions.cmake +++ b/clrdefinitions.cmake @@ -1,7 +1,7 @@ include(clrfeatures.cmake) # If set, indicates that this is not an officially supported release -# Keep in sync with IsPrerelease in dir.props +# Keep in sync with IsPrerelease in Directory.Build.Props set(PRERELEASE 1) # Features we're currently flighting, but don't intend to ship in officially supported releases diff --git a/dir.common.props b/dir.common.props index 00263ccdb3a2..adde0b3baa8d 100644 --- a/dir.common.props +++ b/dir.common.props @@ -1,14 +1,8 @@ - - - - $(MSBuildThisFileDirectory) - $(CoreclrDir)/packages - $(NugetPackageRoot) - + + + @@ -26,16 +20,61 @@ Windows_NT Linux OSX - - <__BuildOS>$(BuildOS) $(BuildType) $(BuildArch) + - $(PackagesDir) + true + true + true + true + true + + true + + + $(__DistroRid) + + + + $(__ProjectDir)/ + $(MSBuildThisFileDirectory) + $(ProjectDir) + + $(__SourceDir)/ + $(ProjectDir)src/ + + $(__RootArtifactsDir) + $(ProjectDir)artifacts/ + $(__BinDir)\ + $(RootArtifactsDir)Product/$(BuildOS)/$(BuildArch)/$(BuildType)/ + + + $(RootArtifactsDir)obj/ + + + $(RootIntermediateOutputPath)/$(BuildOS)/$(BuildArch)/$(BuildType) + + + $(__PackagesBinDir) + $(RootArtifactsDir).nuget/ + + $(UserProfile)/.nuget/packages/ + $(HOME)/.nuget/packages/ + + $(NugetPackageRoot) + + + + $(PackagesDir) + + diff --git a/dir.props b/dir.props index 58f56ed736d4..dfa1fd358acc 100644 --- a/dir.props +++ b/dir.props @@ -3,11 +3,6 @@ - - - 8.0 - true - - - Portable - true - - - - - 4 - 6 - + - coreclr - - $(DotNetRestorePackagesPath) - $(__PackagesDir)\ - $(NuGetPackageRoot) - - $(__RootBinDir)\ - $(ProjectDir)\artifacts - - - $(RootBinDir)obj/ - - x64 - + $(__BinDir)\ - $(RootBinDir)\bin\$(BuildOS)\$(BuildArch)\$(BuildType)\ + $(RootBinDir)Product\$(BuildOS)\$(BuildArch)\$(BuildType)\ <__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj\$(BuildOS)\$(BuildArch)\$(BuildType) $(__IntermediatesDir)\ diff --git a/dir.targets b/dir.targets index 3b507fc9c1d8..15ec8b80f451 100644 --- a/dir.targets +++ b/dir.targets @@ -1,17 +1,8 @@ - - - - - - + - - - diff --git a/init-distro-rid.sh b/init-distro-rid.sh index ebf77fc42e72..dd0dab0814fd 100644 --- a/init-distro-rid.sh +++ b/init-distro-rid.sh @@ -172,5 +172,6 @@ initDistroRidGlobal() echo "__RuntimeId: ${__DistroRid}" export __RuntimeId=${__DistroRid} + export PackageRID=${__DistroRid} fi } \ No newline at end of file diff --git a/src/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj b/src/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj index 434e513c1701..ed319ef64747 100644 --- a/src/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj +++ b/src/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds index b14c6b29ab5e..3cbbaece9a54 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.builds @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj index 40d9f498de80..f72c3a894484 100644 --- a/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds index 679fffeadd1c..09af5cf3624a 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.builds @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj index 47991a1c9d99..cf035e1171e3 100644 --- a/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj +++ b/src/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds index dd00e039a66b..6a3d763aa833 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.builds @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj index e1e09869d7bc..c23279d3ddfe 100644 --- a/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds index 6318c1c0d15b..b4e2a16cf8b3 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds @@ -2,7 +2,7 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj index dd949d2c9b2a..040448cc3b75 100644 --- a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj @@ -3,7 +3,7 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds index dd00e039a66b..6a3d763aa833 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj index 6694c2a51095..d3d5945a2069 100644 --- a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -3,7 +3,7 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds index c55af3a6d3ba..77426c247c07 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj index 89ebb22ee9fa..4a2928e2ec13 100644 --- a/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj +++ b/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj b/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj index 4ea647364098..5fc68291afce 100644 --- a/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj +++ b/src/.nuget/Microsoft.TargetingPack.Private.CoreCLR/Microsoft.TargetingPack.Private.CoreCLR.pkgproj @@ -1,6 +1,6 @@  - + diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index 29ea200dd08d..b2cccc33d2b6 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -1,6 +1,6 @@ - + diff --git a/src/.nuget/init/init.csproj b/src/.nuget/init/init.csproj index 115090dd7686..09934e83551a 100644 --- a/src/.nuget/init/init.csproj +++ b/src/.nuget/init/init.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU diff --git a/src/.nuget/optdata/ibcmerge.csproj b/src/.nuget/optdata/ibcmerge.csproj index e69ac17b4a58..3c14bd5bd3fe 100644 --- a/src/.nuget/optdata/ibcmerge.csproj +++ b/src/.nuget/optdata/ibcmerge.csproj @@ -1,6 +1,6 @@ - + netstandard diff --git a/src/.nuget/optdata/optdata.csproj b/src/.nuget/optdata/optdata.csproj index 408e5363ed80..6a6f970c6f90 100644 --- a/src/.nuget/optdata/optdata.csproj +++ b/src/.nuget/optdata/optdata.csproj @@ -1,7 +1,4 @@ - - - netstandard true diff --git a/src/.nuget/packages.builds b/src/.nuget/packages.builds index 44e97ffc3dab..021c12d2eada 100644 --- a/src/.nuget/packages.builds +++ b/src/.nuget/packages.builds @@ -1,6 +1,6 @@ - + diff --git a/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets b/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets index e8eefb0f69ae..7fe11b60d6f4 100644 --- a/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets +++ b/src/System.Private.CoreLib/CreateRuntimeRootILLinkDescriptorFile.targets @@ -1,9 +1,5 @@ - - _CreateILLinkRuntimeRootDescriptorFile;$(CompileDependsOn) - - <_ILLinkRuntimeRootDescriptorFileName Condition=" '$(_ILLinkRuntimeRootDescriptorFileName)' == '' ">System.Private.CoreLib.xml <_ILLinkRuntimeRootDescriptorFilePath Condition=" '$(_ILLinkRuntimeRootDescriptorFilePath)' == '' ">$(IntermediateOutputPath)$(_ILLinkRuntimeRootDescriptorFileName) diff --git a/src/System.Private.CoreLib/ILLink.targets b/src/System.Private.CoreLib/ILLink.targets index f33e2203ea5e..e5ede35f04d4 100644 --- a/src/System.Private.CoreLib/ILLink.targets +++ b/src/System.Private.CoreLib/ILLink.targets @@ -48,7 +48,7 @@ rewriting the assembly to an "output assembly" --> - + $(ILLinkArgs)-r $(TargetName) diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj index a5f8151b47a3..2968ebebec85 100644 --- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -1,6 +1,6 @@  - + @@ -17,18 +17,17 @@ Exe netcoreapp3.0 + + Portable + - $(OutputPath)IL\ + $(BinDir)IL\ true - - $(ProjectDir)bin\ - - @@ -74,9 +73,17 @@ <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation true - $(OutputPath)$(MSBuildProjectName).xml + $(BinDir)$(MSBuildProjectName).xml + + + + True + false + + + x64 @@ -413,6 +420,7 @@ + true @@ -420,7 +428,7 @@ - $(__IntermediatesDir)\cmake.definitions + $(IntermediatesDir)\cmake.definitions @@ -447,11 +455,29 @@ None + - - $(ToolsDir)SilverlightPlatformPublicKey.snk - - None + $(MSBuildProjectName) + .dll + + + + $(ILLinkTasksPackageVersion) + + + + + + + + + + + $(MSBuildProjectName).xml + + + + diff --git a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj index fc32f343f617..8c43364208fd 100644 --- a/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj +++ b/src/ToolBox/SOS/NETCore/SOS.NETCore.csproj @@ -1,5 +1,5 @@  - + diff --git a/src/build.proj b/src/build.proj index d23848546d24..0a64a600b2a8 100644 --- a/src/build.proj +++ b/src/build.proj @@ -1,5 +1,5 @@ - + diff --git a/src/createVersionFile.proj b/src/createVersionFile.proj index 4edddc71189e..9686d19b6c29 100644 --- a/src/createVersionFile.proj +++ b/src/createVersionFile.proj @@ -1,6 +1,6 @@ - + diff --git a/src/publishwitharcade.proj b/src/publishwitharcade.proj index f5129c3a86f1..dc75d131b42b 100644 --- a/src/publishwitharcade.proj +++ b/src/publishwitharcade.proj @@ -1,7 +1,7 @@ - + diff --git a/src/syncAzure.proj b/src/syncAzure.proj index c5360d77f5a9..ca429df8ce29 100644 --- a/src/syncAzure.proj +++ b/src/syncAzure.proj @@ -1,6 +1,6 @@ - + $(ContainerName.Replace(".","-")) diff --git a/src/tools/r2rdump/R2RDump.csproj b/src/tools/r2rdump/R2RDump.csproj index 026e4a5ee92b..d6756e87eaf1 100644 --- a/src/tools/r2rdump/R2RDump.csproj +++ b/src/tools/r2rdump/R2RDump.csproj @@ -1,5 +1,5 @@  - + R2RDump diff --git a/tests/helixpublishwitharcade.proj b/tests/helixpublishwitharcade.proj index d928269412ad..2c648ac9b664 100644 --- a/tests/helixpublishwitharcade.proj +++ b/tests/helixpublishwitharcade.proj @@ -19,7 +19,7 @@ <_PropertiesToPass> __BuildArch=$(__BuildArch); - __BuildOS=$(__BuildOS); + __BuildOS=$(BuildOS); __BuildType=$(__BuildType); Creator=$(_Creator); HelixAccessToken=$(_HelixAccessToken); diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj index f376265528b1..cbdf0fe7c5f0 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericClasses.csproj @@ -14,7 +14,7 @@ 1 - true + true diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj index e3a657319a6f..44b56bd3171d 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericStructs.csproj @@ -14,7 +14,7 @@ 1 - true + true diff --git a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj index 7d59baaa4989..e101939bbfdb 100644 --- a/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj +++ b/tests/src/Loader/classloader/generics/Instantiation/Nesting/NestedGenericTypesMix.csproj @@ -14,7 +14,7 @@ 1 - true + true