From 8b471f76eef041f0cf40fec65c99a29b235bbe7d Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Thu, 30 Mar 2017 14:21:05 -0700 Subject: [PATCH 01/11] Move corefx onto the .NET Core 2.0 toolset --- DotnetCLIVersion.txt | 2 +- Tools-Override/MSBuild.runtimeconfig.json | 6 +- Tools-Override/crossgen.sh | 15 +- Tools-Override/packageresolve.targets | 20 ++- Tools-Override/tests.targets | 2 + dependencies.props | 9 +- dir.props | 2 +- external/ILLink/ILLink.depproj | 11 ++ external/ILLink/illink.runtimeconfig.json | 9 ++ external/ILLink/project.json.template | 14 -- external/dir.proj | 3 +- external/dir.props | 3 + external/dir.targets | 22 --- .../harvestPackages.netstandard1.6.depproj | 143 ++++++++++++++++++ ...epproj => harvestPackages.uap10.0.depproj} | 11 ++ .../harvestPackages/project.json.template | 56 ------- external/ilasm/ilasm.depproj | 16 ++ external/ilasm/project.json.template | 14 -- external/netfx/netfx.depproj | 6 + external/netfx/project.json.template | 9 -- external/netstandard/netstandard.depproj | 24 ++- .../netstandard1.x/project.json.template | 13 -- external/netstandard/project.json.template | 9 -- external/portable/portable.depproj | 5 + external/portable/project.json.template | 9 -- external/runtime/project.json.template | 17 --- external/runtime/runtime.depproj | 29 +++- external/test-runtime/XUnit.Runtime.depproj | 65 +++++++- external/test-runtime/project.json | 33 ---- external/uapaotredist/project.json.template | 16 -- external/uapaotredist/uapaotredist.depproj | 14 ++ external/winrt/project.json.template | 8 - external/winrt/winrt.depproj | 5 + init-tools.cmd | 14 +- init-tools.sh | 23 ++- ...System.IO.Compression.ZipFile.Tests.csproj | 4 +- ...em.IO.Compression.Performance.Tests.csproj | 4 +- .../tests/System.IO.Compression.Tests.csproj | 2 +- .../tests/System.IO.Packaging.Tests.csproj | 4 +- .../System.Net.Http.Functional.Tests.csproj | 4 +- .../System.Net.Security.Tests.csproj | 4 +- ...Cryptography.X509Certificates.Tests.csproj | 2 +- src/Tools/CoreFx.Tools/CoreFx.Tools.builds | 1 - src/Tools/CoreFx.Tools/CoreFx.Tools.csproj | 6 +- .../CoreFx.Tools/PackageReferences.msbuild | 38 +++++ src/Tools/CoreFx.Tools/project.json | 32 ---- src/Tools/GenerateProps/targetgroups.props | 31 ++++ src/Tools/corefxTools.props | 4 +- src/src.builds | 2 +- 49 files changed, 470 insertions(+), 325 deletions(-) create mode 100644 external/ILLink/illink.runtimeconfig.json delete mode 100644 external/ILLink/project.json.template create mode 100644 external/harvestPackages/harvestPackages.netstandard1.6.depproj rename external/harvestPackages/{harvestPackages.depproj => harvestPackages.uap10.0.depproj} (73%) delete mode 100644 external/harvestPackages/project.json.template delete mode 100644 external/ilasm/project.json.template delete mode 100644 external/netfx/project.json.template delete mode 100644 external/netstandard/netstandard1.x/project.json.template delete mode 100644 external/netstandard/project.json.template delete mode 100644 external/portable/project.json.template delete mode 100644 external/runtime/project.json.template delete mode 100644 external/test-runtime/project.json delete mode 100644 external/uapaotredist/project.json.template delete mode 100644 external/winrt/project.json.template create mode 100644 src/Tools/CoreFx.Tools/PackageReferences.msbuild delete mode 100644 src/Tools/CoreFx.Tools/project.json diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index e42fc5fdff1d..5bfd2bac7de6 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0-preview2-1-003182 \ No newline at end of file +2.0.0-preview1-005724 diff --git a/Tools-Override/MSBuild.runtimeconfig.json b/Tools-Override/MSBuild.runtimeconfig.json index 167e7dc1f335..59e0f418f820 100644 --- a/Tools-Override/MSBuild.runtimeconfig.json +++ b/Tools-Override/MSBuild.runtimeconfig.json @@ -2,10 +2,10 @@ "runtimeOptions": { "framework": { "name": "Microsoft.NETCore.App", - "version": "1.1.0" + "version": "2.0.0-preview1-001913-00" }, "configProperties": { - "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true + "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true } } -} \ No newline at end of file +} diff --git a/Tools-Override/crossgen.sh b/Tools-Override/crossgen.sh index 880c43a6217f..ed81eefe1971 100755 --- a/Tools-Override/crossgen.sh +++ b/Tools-Override/crossgen.sh @@ -2,7 +2,9 @@ # Restores crossgen and runs it on all tools components. -__CoreClrVersion=1.1.0 +__CoreClrVersion=2.0.0-preview1-25204-02 +__SharedFxVersion=2.0.0-preview1-001913-00 +__MyGetFeed=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json usage() { @@ -20,15 +22,16 @@ restore_crossgen() __pjDir=$__toolsDir/crossgen mkdir -p $__pjDir - echo "{\"frameworks\":{\"netcoreapp1.1\":{\"dependencies\":{\"Microsoft.NETCore.Runtime.CoreCLR\":\"$__CoreClrVersion\", \"Microsoft.NETCore.Platforms\": \"$__CoreClrVersion\"}}},\"runtimes\":{\"$__rid\":{}}}" > "$__pjDir/project.json" - $__dotnet restore $__pjDir/project.json --packages $__packagesDir - __crossgenInPackage=$__packagesDir/runtime.$__packageRid.Microsoft.NETCore.Runtime.CoreCLR/$__CoreClrVersion/tools/crossgen + echo "netcoreapp2.0true$__packageRid" > "$__pjDir/crossgen.csproj" + $__dotnet restore $__pjDir/crossgen.csproj --packages $__packagesDir --source $__MyGetFeed + __crossgenInPackage=$__packagesDir/runtime.$__packageRid.microsoft.netcore.runtime.coreclr/$__CoreClrVersion/tools/crossgen if [ ! -e $__crossgenInPackage ]; then echo "The crossgen executable could not be found at "$__crossgenInPackage". Aborting crossgen.sh." exit 1 fi cp $__crossgenInPackage $__sharedFxDir __crossgen=$__sharedFxDir/crossgen + chmod +x $__crossgen } crossgen_everything() @@ -50,7 +53,7 @@ crossgen_everything() crossgen_single() { __file=$1 - $__crossgen /Platform_Assemblies_Paths $__toolsDir:$__sharedFxDir /nologo /MissingDependenciesOK $__file > /dev/null + $__crossgen /Platform_Assemblies_Paths $__sharedFxDir:$__toolsDir /nologo /MissingDependenciesOK /ReadyToRun $__file > /dev/null if [ $? -eq 0 ]; then __outname="${__file/.dll/.ni.dll}" __outname="${__outname/.exe/.ni.exe}" @@ -74,7 +77,7 @@ __scriptpath=$(cd "$(dirname "$0")"; pwd -P) __toolsDir=$__scriptpath/../Tools __dotnet=$__toolsDir/dotnetcli/dotnet __packagesDir=$__scriptpath/../packages -__sharedFxDir=$__toolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__CoreClrVersion/ +__sharedFxDir=$__toolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__SharedFxVersion/ __rid=$($__dotnet --info | sed -n -e 's/^.*RID:[[:space:]]*//p') if [[ $__rid == *"osx"* ]]; then diff --git a/Tools-Override/packageresolve.targets b/Tools-Override/packageresolve.targets index 44cf4d3b00f5..5e12d0f33e89 100755 --- a/Tools-Override/packageresolve.targets +++ b/Tools-Override/packageresolve.targets @@ -6,8 +6,11 @@ - $(MSBuildProjectDirectory)/project.json - $(MSBuildProjectDirectory)/project.lock.json + $(MSBuildProjectFullPath) + $(MSBuildProjectDirectory) + $([System.IO.Path]::GetDirectoryName('$(ProjectJson)'))/obj + + $(RestoreOutputPath)/project.assets.json $(MSBuildProjectFullPath) true true @@ -32,16 +35,19 @@ - + + <_DnuRestoreCommandRidPortion Condition="'$(RidSpecificAssets)' == 'true'">-r $(NuGetRuntimeIdentifier) + <_DnuRestoreCommandFull>$(DnuRestoreCommand) $(ProjectJson) /p:TargetGroup=$(TargetGroup) /p:TargetFramework=$(NuGetTargetMonikerShort) $(_DnuRestoreCommandRidPortion) + + - + - $(ResolveAssemblyReferencesDependsOn); @@ -77,13 +83,13 @@ Condition="'$(PrereleaseResolveNuGetPackages)'=='true'" DependsOnTargets="$(ResolveNugetPackagesDependsOn)"> - diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets index a8355629114d..c66955decef9 100644 --- a/Tools-Override/tests.targets +++ b/Tools-Override/tests.targets @@ -281,6 +281,7 @@ + @@ -299,6 +300,7 @@ RunnerScriptTemplate="$(MSBuildThisFileDirectory)/$(RunnerTemplateName)" ScriptOutputPath ="$(OutputPathForScriptGenerator)" /> + 1.0.3-prerelease-00921-01 1.0.0-alpha-build0049 1.0.0-alpha-experimental + 1.0.1-prerelease-01401-04 @@ -151,7 +152,7 @@ - 1.0.1-prerelease-01401-04 + $(XunitNetcoreExtensionsVersion) @@ -171,11 +172,5 @@ microsoft.xunit.runner.uwp $(AppXRunnerVersion) - - - - - - diff --git a/dir.props b/dir.props index 4ce980e4885e..fa49d1024586 100644 --- a/dir.props +++ b/dir.props @@ -104,7 +104,7 @@ $(DnuRestoreCommand) restore $(DnuRestoreCommand) --parallel $(DnuRestoreCommand) --no-cache - $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource) + $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(DnuRestoreSource) $(DnuRestoreCommand) --lock $(DnuRestoreCommand) --configfile $(NuGetConfigPath) diff --git a/external/ILLink/ILLink.depproj b/external/ILLink/ILLink.depproj index 853c90047b29..ab060b3030e5 100644 --- a/external/ILLink/ILLink.depproj +++ b/external/ILLink/ILLink.depproj @@ -3,9 +3,20 @@ .NETCoreApp,Version=v1.1 + netcoreapp1.1 $(ToolsDir)ILLink false + true + + + 0.1.8-preview + Analyzers;Build;ContentFiles;Native;Runtime + + + PreserveNewest + + diff --git a/external/ILLink/illink.runtimeconfig.json b/external/ILLink/illink.runtimeconfig.json new file mode 100644 index 000000000000..51d628647537 --- /dev/null +++ b/external/ILLink/illink.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "netcoreapp1.1", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "2.0.0-preview1-001913-00" + } + } +} diff --git a/external/ILLink/project.json.template b/external/ILLink/project.json.template deleted file mode 100644 index e7c9cde5f333..000000000000 --- a/external/ILLink/project.json.template +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.ILLink": { - "version": "0.1.8-preview", - "exclude": "compile" - } - }, - "frameworks": { - "netcoreapp1.1": { } - }, - "runtimes": { - "{RID}": {} - } -} diff --git a/external/dir.proj b/external/dir.proj index 3912e6143f36..4c5085a132d3 100644 --- a/external/dir.proj +++ b/external/dir.proj @@ -11,7 +11,8 @@ - + + diff --git a/external/dir.props b/external/dir.props index 286fde00b3fb..424b15fce2a9 100644 --- a/external/dir.props +++ b/external/dir.props @@ -8,5 +8,8 @@ linux --> $(RuntimeOS)-$(ArchGroup) + true + + $(BaseIntermediateOutputPath)external/$(MSBuildProjectName)/$(TargetGroup) diff --git a/external/dir.targets b/external/dir.targets index c713f4c770eb..83f658c87b99 100644 --- a/external/dir.targets +++ b/external/dir.targets @@ -1,10 +1,4 @@ - - $(MSBuildThisProjectDirectory)project.json.template - $(IntermediateOutputPath)project.json - $(IntermediateOutputPath)project.lock.json - - @@ -12,22 +6,6 @@ true - - - - - - + + + + + + netstandard1.6 + + + + + 4.3.0 + + + 10.1.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 1.3.0 + + + 1.0.31 + + + 1.0.31 + + + 1.0.31 + + + 1.0.31 + + + 1.0.31 + + + 1.0.31 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 1.4.1 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.7.0 + + + 4.3.0 + + + 4.3.0 + + + + + + \ No newline at end of file diff --git a/external/harvestPackages/harvestPackages.depproj b/external/harvestPackages/harvestPackages.uap10.0.depproj similarity index 73% rename from external/harvestPackages/harvestPackages.depproj rename to external/harvestPackages/harvestPackages.uap10.0.depproj index 7f78359421d2..f4288e2b4a0f 100644 --- a/external/harvestPackages/harvestPackages.depproj +++ b/external/harvestPackages/harvestPackages.uap10.0.depproj @@ -2,6 +2,17 @@ + + + uap10.0 + + + + + 4.3.0 + + + diff --git a/external/harvestPackages/project.json.template b/external/harvestPackages/project.json.template deleted file mode 100644 index 2bbc08839ae0..000000000000 --- a/external/harvestPackages/project.json.template +++ /dev/null @@ -1,56 +0,0 @@ -{ - "frameworks": { - "netstandard1.6": { - "dependencies": { - "Microsoft.CSharp": "4.3.0", - "Microsoft.VisualBasic": "10.1.0", - "Microsoft.Win32.Registry": "4.3.0", - "Microsoft.Win32.Registry.AccessControl": "4.3.0", - "System.Buffers": "4.3.0", - "System.Collections.Immutable": "1.3.0", - "System.Composition": "1.0.31", - "System.Composition.AttributedModel": "1.0.31", - "System.Composition.Convention": "1.0.31", - "System.Composition.Hosting": "1.0.31", - "System.Composition.Runtime": "1.0.31", - "System.Composition.TypedParts": "1.0.31", - "System.Data.SqlClient": "4.3.0", - "System.Diagnostics.DiagnosticSource": "4.3.0", - "System.IO.Compression": "4.3.0", - "System.IO.FileSystem.AccessControl": "4.3.0", - "System.IO.Packaging": "4.3.0", - "System.IO.Pipes.AccessControl": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Net.Http.Rtc": "4.3.0", - "System.Net.Http.WinHttpHandler": "4.3.0", - "System.Numerics.Vectors": "4.3.0", - "System.Reflection.Context": "4.3.0", - "System.Reflection.DispatchProxy": "4.3.0", - "System.Reflection.Metadata": "1.4.1", - "System.Reflection.TypeExtensions": "4.3.0", - "System.Runtime.CompilerServices.Unsafe": "4.3.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.3.0", - "System.Runtime.WindowsRuntime": "4.3.0", - "System.Runtime.WindowsRuntime.UI.Xaml": "4.3.0", - "System.Security.AccessControl": "4.3.0", - "System.Security.Cryptography.OpenSsl": "4.3.0", - "System.Security.Cryptography.Pkcs": "4.3.0", - "System.Security.Cryptography.ProtectedData": "4.3.0", - "System.Security.Cryptography.X509Certificates": "4.3.0", - "System.Security.Principal.Windows": "4.3.0", - "System.ServiceProcess.ServiceController": "4.3.0", - "System.Text.Encoding.CodePages": "4.3.0", - "System.Text.Encodings.Web": "4.3.0", - "System.Threading.AccessControl": "4.3.0", - "System.Threading.Tasks.Dataflow": "4.7.0", - "System.Threading.Tasks.Extensions": "4.3.0", - "System.ValueTuple": "4.3.0" - } - }, - "uap10.0": { - "dependencies": { - "System.Numerics.Vectors.WindowsRuntime": "4.3.0" - } - } - } -} diff --git a/external/ilasm/ilasm.depproj b/external/ilasm/ilasm.depproj index 0341bf5c0e88..01f013ed39e9 100644 --- a/external/ilasm/ilasm.depproj +++ b/external/ilasm/ilasm.depproj @@ -6,6 +6,22 @@ $(RuntimeOS)-x64 $(ToolsDir)ilasm false + true + + + 2.0.0-$(CoreFxExpectedPrerelease) + + + 2.0.0-$(CoreClrExpectedPrerelease) + + + 2.0.0-$(CoreClrExpectedPrerelease) + + + + + + diff --git a/external/ilasm/project.json.template b/external/ilasm/project.json.template deleted file mode 100644 index 945f3aa076b3..000000000000 --- a/external/ilasm/project.json.template +++ /dev/null @@ -1,14 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25207-02", - "Microsoft.NETCore.ILAsm": "2.0.0-preview1-25207-02" - } - } - }, - "runtimes": { - "{RID}": {} - } -} diff --git a/external/netfx/netfx.depproj b/external/netfx/netfx.depproj index eed64a22b6b6..db115c32120a 100644 --- a/external/netfx/netfx.depproj +++ b/external/netfx/netfx.depproj @@ -13,9 +13,15 @@ .NETFramework,Version=v4.6.1 + net461 Microsoft.TargetingPack.NETFramework.v4.6.1 true + + + 1.0.1 + + $(RefPath) diff --git a/external/netfx/project.json.template b/external/netfx/project.json.template deleted file mode 100644 index 4cc6dfed2d6b..000000000000 --- a/external/netfx/project.json.template +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "{PackageId}": "1.0.1" - } - } - } -} diff --git a/external/netstandard/netstandard.depproj b/external/netstandard/netstandard.depproj index 798cdea51420..54580889b7b1 100644 --- a/external/netstandard/netstandard.depproj +++ b/external/netstandard/netstandard.depproj @@ -10,11 +10,31 @@ true Reference None - $(MSBuildProjectDirectory)\netstandard1.x\project.json.template <_NETStandardTFMFolder Condition="'$(NuGetTargetMoniker)' == '.NETStandard,Version=v2.0'">netstandard2.0 <_NETStandardTFMFolder Condition="'$(IsNetFx)' == 'true'">net461 + + + $(NETStandardPackageVersion) + + + + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + 4.3.0 + + + @@ -31,7 +51,7 @@ - <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref + <_NETStandardRefFolder>$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\$(_NETStandardTFMFolder)\ref diff --git a/external/netstandard/netstandard1.x/project.json.template b/external/netstandard/netstandard1.x/project.json.template deleted file mode 100644 index d13b533d40b9..000000000000 --- a/external/netstandard/netstandard1.x/project.json.template +++ /dev/null @@ -1,13 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "NETStandard.Library": "2.0.0-preview1-25210-01", - "System.Diagnostics.Contracts": "4.3.0", - "System.Diagnostics.Debug": "4.3.0", - "System.Dynamic.Runtime": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.3.0" - } - } - } -} diff --git a/external/netstandard/project.json.template b/external/netstandard/project.json.template deleted file mode 100644 index f74f1d5e981b..000000000000 --- a/external/netstandard/project.json.template +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "NETStandard.Library": "2.0.0-preview1-25210-01" - } - } - } -} diff --git a/external/portable/portable.depproj b/external/portable/portable.depproj index 3251b5ecad6c..54b1f268db0a 100644 --- a/external/portable/portable.depproj +++ b/external/portable/portable.depproj @@ -6,6 +6,11 @@ Reference None + + + 1.0.0 + + diff --git a/external/portable/project.json.template b/external/portable/project.json.template deleted file mode 100644 index 08936feb37fc..000000000000 --- a/external/portable/project.json.template +++ /dev/null @@ -1,9 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "{PackageId}": "1.0.0" - } - } - } -} diff --git a/external/runtime/project.json.template b/external/runtime/project.json.template deleted file mode 100644 index a06027b44c61..000000000000 --- a/external/runtime/project.json.template +++ /dev/null @@ -1,17 +0,0 @@ -{ - "frameworks": { - "{TFM}": { - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25210-01", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25207-02", - "Microsoft.NETCore.TestHost": "2.0.0-preview1-25207-02", - "runtime.native.System.Data.SqlClient.sni": "4.4.0-preview1-25210-01", - "Microsoft.NETCore.DotNetHost": "1.2.0-beta-001259-00", - "Microsoft.NETCore.DotNetHostPolicy": "1.2.0-beta-001259-00" - } - } - }, - "runtimes": { - "{RID}": {} - } -} diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 4aef5df03fe8..0a9b68762b9c 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -7,18 +7,45 @@ ubuntu.14.04-x64 win10-$(ArchGroup) win10-$(ArchGroup)-aot + true + true - $(MSBuildThisFileDirectory)NETNative/project.json.template false Reference + + 1.1.0-beta-25128-00 + + + + + 2.0.0-$(CoreFxExpectedPrerelease) + + + 2.0.0-$(CoreClrExpectedPrerelease) + + + 2.0.0-$(CoreClrExpectedPrerelease) + + + 4.4.0-$(CoreFxExpectedPrerelease) + + + 1.2.0-beta-001259-00 + + + 1.2.0-beta-001259-00 + + + + diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj index b254d1ff5150..a0a7745a41b0 100644 --- a/external/test-runtime/XUnit.Runtime.depproj +++ b/external/test-runtime/XUnit.Runtime.depproj @@ -6,14 +6,75 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> win7-x64 + true $(RuntimePath) xunit.console.netcore xunit.runner.console .NETStandard,Version=v2.0 + netstandard2.0 .NETStandard,Version=v2.0 + netstandard2.0 - + + $(AppXRunnerVersion) + + + $(XunitNetcoreExtensionsVersion) + + + $(XunitNetcoreExtensionsVersion) + + + $(XunitPerfAnalysisPackageVersion) + + + $(XunitPerfAnalysisPackageVersion) + + + $(XunitPerfAnalysisPackageVersion) + + + $(XunitPerfAnalysisPackageVersion) + + + $(TraceEventPackageVersion) + + + 0.10.0-alpha-experimental + + + 2.1.1-beta + + + 9.0.1 + + + 1.4 + + + 4.6.519 + + + 2.5.0 + + + 1.0.4-prerelease + + + 1.0.0-prerelease + + + 1.0.2-prerelease + + + 1.0.0-prerelease + + + + + $(XUnitPackageVersion) + @@ -45,7 +106,7 @@ 1.0.2 - Microsoft.DotNet.UAP.TestTools + microsoft.dotnet.uap.testtools $(PackagesDir)$(UAPToolsPackageName)\$(UAPToolsPackageVersion)\Tools $(UAPToolsFolder.Replace('/', '\')) diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json deleted file mode 100644 index 537db9572347..000000000000 --- a/external/test-runtime/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "xunit.console.netcore": "1.0.3-prerelease-00921-01", - "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01401-04", - "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01401-04", - "xunit.performance.api": "1.0.0-alpha-build0049", - "xunit.performance.core": "1.0.0-alpha-build0049", - "xunit.performance.execution": "1.0.0-alpha-build0049", - "xunit.performance.metrics": "1.0.0-alpha-build0049", - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.0-alpha-experimental", - "Microsoft.3rdpartytools.MarkdownLog": "0.10.0-alpha-experimental", - "CommandLineParser": "2.1.1-beta", - "Newtonsoft.Json": "9.0.1", - "coveralls.io": "1.4", - "OpenCover": "4.6.519", - "ReportGenerator": "2.5.0", - "System.IO.Compression.TestData": "1.0.4-prerelease", - "System.IO.Packaging.TestData": "1.0.0-prerelease", - "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease", - "System.Net.TestData": "1.0.0-prerelease" - }, - "frameworks": { - "netstandard2.0": {}, - "net463": { - "dependencies": { - "xunit.runner.console": "2.2.0-beta4-build3444" - } - } - }, - "runtimes": { - "win7-x64": {} - } -} diff --git a/external/uapaotredist/project.json.template b/external/uapaotredist/project.json.template deleted file mode 100644 index 47c0f7b588fa..000000000000 --- a/external/uapaotredist/project.json.template +++ /dev/null @@ -1,16 +0,0 @@ -{ - "frameworks": { - "netcore50": { - "dependencies": { - "System.Diagnostics.Tracing": "4.3.0", - "System.Dynamic.Runtime": "4.0.11", - "System.Net.Requests": "4.0.11", - "System.Linq.Expressions": "4.3.0" - } - }, - }, - - "runtimes": { - "{RID}": {} - } -} \ No newline at end of file diff --git a/external/uapaotredist/uapaotredist.depproj b/external/uapaotredist/uapaotredist.depproj index 4871dbaa0647..b66267c3afb4 100644 --- a/external/uapaotredist/uapaotredist.depproj +++ b/external/uapaotredist/uapaotredist.depproj @@ -7,8 +7,22 @@ win10-x64-aot .NETCore,Version=v5.0 + netcore50 + true + + 4.3.0 + + + 4.0.11 + + + 4.0.11 + + + 4.3.0 + diff --git a/external/winrt/project.json.template b/external/winrt/project.json.template deleted file mode 100644 index 8ccca2018a3a..000000000000 --- a/external/winrt/project.json.template +++ /dev/null @@ -1,8 +0,0 @@ -{ - "dependencies": { - "Microsoft.TargetingPack.Private.WinRT": "1.0.3" - }, - "frameworks": { - "{TFM}": {} - } -} diff --git a/external/winrt/winrt.depproj b/external/winrt/winrt.depproj index 3d3a1add5dd7..15e50b350f26 100644 --- a/external/winrt/winrt.depproj +++ b/external/winrt/winrt.depproj @@ -8,5 +8,10 @@ Reference None + + + 1.0.3 + + \ No newline at end of file diff --git a/init-tools.cmd b/init-tools.cmd index fb6be2c29981..8230da38ba68 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -10,8 +10,8 @@ if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/do 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 PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.csproj +set PROJECT_JSON_CONTENTS=^^^^^^^^^netcoreapp1.0^^^^^^true^^^^^^^^^^^^^^^^^^ set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated @@ -38,7 +38,7 @@ if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip -set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.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%" @@ -69,14 +69,6 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( exit /b %INIT_TOOLS_ERRORLEVEL% ) -echo Updating CLI NuGet Frameworks map... -robocopy "%TOOLRUNTIME_DIR%" "%TOOLRUNTIME_DIR%\dotnetcli\sdk\%DOTNET_VERSION%" NuGet.Frameworks.dll /XO >> "%INIT_TOOLS_LOG%" -set UPDATE_CLI_ERRORLEVEL=%ERRORLEVEL% -if %UPDATE_CLI_ERRORLEVEL% GTR 1 ( - echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL%}. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 - exit /b %UPDATE_CLI_ERRORLEVEL% -) - :: Create sempahore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" diff --git a/init-tools.sh b/init-tools.sh index e4705a741023..5e30000114e6 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -7,12 +7,13 @@ __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 +__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\": { } } }" +__PROJECT_JSON_CONTENTS="netcoreapp1.0true" __INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done # Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc @@ -106,7 +107,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH else echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" + __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 which curl > /dev/null 2> /dev/null @@ -144,6 +145,8 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Initializing BuildTools..." echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log + + 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 @@ -151,17 +154,13 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi - if [ $__PATCH_CLI_NUGET_FRAMEWORKS -eq 1 ]; then - echo "Updating CLI NuGet Frameworks map..." - cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log - if [ "$?" != "0" ]; then - echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2 - exit 1 - fi - fi - Tools-Override/crossgen.sh $__scriptpath/Tools + echo "Making all .sh files executable under Tools." + ls $__scriptpath/Tools/*.sh | xargs chmod +x + + cp Tools-Override/* Tools + touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj index 85d4cde6678d..e04e193e8b51 100644 --- a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj +++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.csproj @@ -41,9 +41,9 @@ - + %(RecursiveDir)%(Filename)%(Extension) - \ No newline at end of file + diff --git a/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj b/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj index 831830971282..41d2afa4084e 100644 --- a/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj +++ b/src/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj @@ -23,7 +23,7 @@ - + %(RecursiveDir)%(Filename)%(Extension) @@ -34,4 +34,4 @@ - \ No newline at end of file + diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj index 7db0a4e07c38..9ada41dfe64e 100644 --- a/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj +++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.csproj @@ -43,7 +43,7 @@ - + %(RecursiveDir)%(Filename)%(Extension) diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj index 2c81d0eb3059..e2a2ecbbe051 100644 --- a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj +++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.csproj @@ -10,7 +10,7 @@ - + - \ No newline at end of file + diff --git a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index e27b9c20d0c1..9ef6cbf2144a 100644 --- a/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -99,7 +99,7 @@ - + - \ No newline at end of file + diff --git a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 3210b9d1cf4c..7e539386a9b8 100644 --- a/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -143,7 +143,7 @@ - + @@ -152,4 +152,4 @@ - \ No newline at end of file + diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj index 3be0000d8d94..f0384bf7a386 100644 --- a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj +++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.csproj @@ -70,7 +70,7 @@ - + \ No newline at end of file diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds index d274df490c66..b213d33d4d0c 100644 --- a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds +++ b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds @@ -5,7 +5,6 @@ net46 - diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj b/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj index 43d1ad0af850..1533222ead5d 100644 --- a/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj +++ b/src/Tools/CoreFx.Tools/CoreFx.Tools.csproj @@ -4,11 +4,14 @@ Library .NETStandard,Version=v1.5 + netstandard1.5 .NETFramework,Version=v4.6 + net46 false {360F25FA-3CD9-4338-B961-A4F3122B88B2} $(CoreFxToolsDir) $(CoreFxDesktopToolsDir) + $(MSBuildThisFileDirectory)PackageReferences.msbuild @@ -43,8 +46,5 @@ - - - \ No newline at end of file diff --git a/src/Tools/CoreFx.Tools/PackageReferences.msbuild b/src/Tools/CoreFx.Tools/PackageReferences.msbuild new file mode 100644 index 000000000000..ace84213c54a --- /dev/null +++ b/src/Tools/CoreFx.Tools/PackageReferences.msbuild @@ -0,0 +1,38 @@ + + + + 2.0.0-beta-001791-00 + + + + netstandard1.5;net46 + CoreFx.Tools + CoreFx.Tools + 1.6.0 + $(PackageTargetFallback);dnxcore50;portable-net45+win8+wpa81 + + + + + + + + + + + + + + None + + + + + + + + + + + + diff --git a/src/Tools/CoreFx.Tools/project.json b/src/Tools/CoreFx.Tools/project.json deleted file mode 100644 index f8642c60a92a..000000000000 --- a/src/Tools/CoreFx.Tools/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "1.2.0-beta-001090", - "NETStandard.Library": "1.6.0", - "Newtonsoft.Json": "9.0.1" - }, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.Build": "0.1.0-preview-00022", - "Microsoft.Build.Framework": "0.1.0-preview-00022", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", - "Microsoft.Tpl.Dataflow": { - "version": "4.5.24", - "exclude": "all" - } - }, - "imports": [ - "dnxcore50", - "portable-net45+win8+wpa81" - ] - }, - "net46": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1", - "System.Reflection.Metadata": "1.4.2", - "System.Collections.Immutable": "1.3.1" - } - } - } -} \ No newline at end of file diff --git a/src/Tools/GenerateProps/targetgroups.props b/src/Tools/GenerateProps/targetgroups.props index c2de69d1c932..fe4cac6d0f72 100644 --- a/src/Tools/GenerateProps/targetgroups.props +++ b/src/Tools/GenerateProps/targetgroups.props @@ -4,6 +4,7 @@ Microsoft.TargetingPack.Private.NetNative .NETCore,Version=v5.0 + netcore50 true netstandard1.4 @@ -11,6 +12,7 @@ aot Microsoft.TargetingPack.Private.NetNative .NETCore,Version=v5.0 + netcore50 true netcore50 netstandard1.4 @@ -18,18 +20,21 @@ aot UAP,Version=v10.1 + uap10.1 true netcore50aot uap101;netstandard2.0 UAP,Version=v10.1 + uap10.1 true netcore50 netstandard2.0 UAP,Version=v10.1 + uap10.1 true uap101 netstandard @@ -37,18 +42,21 @@ aot UAP,Version=v10.1 + uap10.1 true uap101aot uap;netstandard .NETStandard,Version=v1.0 + netstandard1.0 true .NETStandard,Version=v1.1 + netstandard1.1 true @@ -56,6 +64,7 @@ .NETStandard,Version=v1.2 + netstandard1.2 true @@ -63,6 +72,7 @@ .NETStandard,Version=v1.3 + netstandard1.3 true @@ -70,6 +80,7 @@ .NETStandard,Version=v1.4 + netstandard1.4 true @@ -77,6 +88,7 @@ .NETStandard,Version=v1.5 + netstandard1.5 true @@ -84,6 +96,7 @@ .NETStandard,Version=v1.6 + netstandard1.6 true @@ -91,6 +104,7 @@ .NETStandard,Version=v2.0 + netstandard2.0 true @@ -98,6 +112,7 @@ .NETStandard,Version=v2.0 + netstandard2.0 true @@ -105,80 +120,96 @@ .NETCoreApp,Version=v1.0 + netcoreapp1.0 netstandard1.6 .NETCoreApp,Version=v2.0 + netcoreapp2.0 netcoreapp1.0 netstandard2.0 .NETCoreApp,Version=v2.0 + netcoreapp2.0 netcoreapp2.0 netstandard .NETCoreApp,Version=v1.2 + netcoreapp1.2 .NETCoreApp,Version=v1.2 + netcoreapp1.2 Microsoft.TargetingPack.NETFramework.v4.5 .NETFramework,Version=v4.5 + net45 netstandard1.1 Microsoft.TargetingPack.NETFramework.v4.5.1 .NETFramework,Version=v4.5.1 + net451 net45 netstandard1.2 Microsoft.TargetingPack.NETFramework.v4.6 .NETFramework,Version=v4.6 + net46 net451 netstandard1.3 Microsoft.TargetingPack.NETFramework.v4.6.1 .NETFramework,Version=v4.6.1 + net461 net46 netstandard1.4 Microsoft.TargetingPack.NETFramework.v4.6.2 .NETFramework,Version=v4.6.2 + net462 net461 netstandard1.5 Microsoft.TargetingPack.NETFramework.v4.6.3 .NETFramework,Version=v4.6.3 + net463 net462 netstandard2.0 Microsoft.TargetingPack.NETFramework.v4.6.3 .NETFramework,Version=v4.6.3 + net463 net463 netstandard Windows,Version=v8.0 + win8 netstandard1.1 WindowsPhoneApp,Version=v8.1 + wpa81 netstandard1.2 Microsoft.TargetingPack.Portable.v4.0.Profile47 .NETPortable,Version=v0.0,Profile=Profile47 + portable-net45+win8+sl5 Microsoft.TargetingPack.Portable.v4.0.Profile36 .NETPortable,Version=v0.0,Profile=Profile36 + portable-net40+sl4+win8+wp8 $(ToolsDir) $(ToolsDir)net46/ - $(CoreFxToolsDir) - $(CoreFxDesktopToolsDir) + $(CoreFxToolsDir) + $(CoreFxDesktopToolsDir) diff --git a/src/src.builds b/src/src.builds index 9fb902c873b0..b019b1612721 100644 --- a/src/src.builds +++ b/src/src.builds @@ -12,7 +12,7 @@ - <_ToolsDotNetCliSharedFxPath>$(ToolsDir)dotnetcli\shared\Microsoft.NETCore.App\1.1.0 + <_ToolsDotNetCliSharedFxPath>$(ToolsDir)dotnetcli\shared\Microsoft.NETCore.App\1.1.1 <_OriginalDepsJsonPath>$(_ToolsDotNetCliSharedFxPath)\Microsoft.NETCore.App.deps.json <_OutputTestSharedFrameworkDepsPath>$(NETCoreAppTestSharedFrameworkPath)\Microsoft.NETCore.App.deps.json From 471fe9d8517edabe49a0226456870c4843894637 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Thu, 6 Apr 2017 17:07:14 -0700 Subject: [PATCH 02/11] PR feedback --- Tools-Override/tests.targets | 2 +- external/dir.props | 2 +- external/runtime/runtime.depproj | 2 -- init-tools.sh | 2 -- src/Tools/CoreFx.Tools/CoreFx.Tools.builds | 11 ----------- 5 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 src/Tools/CoreFx.Tools/CoreFx.Tools.builds diff --git a/Tools-Override/tests.targets b/Tools-Override/tests.targets index c66955decef9..e099e1042120 100644 --- a/Tools-Override/tests.targets +++ b/Tools-Override/tests.targets @@ -300,7 +300,7 @@ RunnerScriptTemplate="$(MSBuildThisFileDirectory)/$(RunnerTemplateName)" ScriptOutputPath ="$(OutputPathForScriptGenerator)" /> - + $(RuntimeOS)-$(ArchGroup) true - $(BaseIntermediateOutputPath)external/$(MSBuildProjectName)/$(TargetGroup) + $(IntermediateOutputPath) diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 0a9b68762b9c..8b72dedf4246 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -7,7 +7,6 @@ ubuntu.14.04-x64 win10-$(ArchGroup) win10-$(ArchGroup)-aot - true true @@ -45,7 +44,6 @@ - diff --git a/init-tools.sh b/init-tools.sh index 5e30000114e6..626fa0f4f510 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -159,8 +159,6 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Making all .sh files executable under Tools." ls $__scriptpath/Tools/*.sh | xargs chmod +x - cp Tools-Override/* Tools - touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." diff --git a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds b/src/Tools/CoreFx.Tools/CoreFx.Tools.builds deleted file mode 100644 index b213d33d4d0c..000000000000 --- a/src/Tools/CoreFx.Tools/CoreFx.Tools.builds +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - net46 - - - - \ No newline at end of file From ede99bedfd511d329289b7176f543c6c43c4e989 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 7 Apr 2017 14:04:40 -0700 Subject: [PATCH 03/11] Pass ConfigurationGroup and ArchitectureGroup to restore command. --- Tools-Override/packageresolve.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools-Override/packageresolve.targets b/Tools-Override/packageresolve.targets index 5e12d0f33e89..27066086b18a 100755 --- a/Tools-Override/packageresolve.targets +++ b/Tools-Override/packageresolve.targets @@ -37,7 +37,7 @@ <_DnuRestoreCommandRidPortion Condition="'$(RidSpecificAssets)' == 'true'">-r $(NuGetRuntimeIdentifier) - <_DnuRestoreCommandFull>$(DnuRestoreCommand) $(ProjectJson) /p:TargetGroup=$(TargetGroup) /p:TargetFramework=$(NuGetTargetMonikerShort) $(_DnuRestoreCommandRidPortion) + <_DnuRestoreCommandFull>$(DnuRestoreCommand) $(ProjectJson) /p:TargetGroup=$(TargetGroup) /p:ConfigurationGroup=$(ConfigurationGroup) /p:ArchGroup=$(ArchGroup) /p:TargetFramework=$(NuGetTargetMonikerShort) $(_DnuRestoreCommandRidPortion) From cf8620e2c02b0e486435007b2d3d7aec7c3b833b Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 7 Apr 2017 14:48:39 -0700 Subject: [PATCH 04/11] Fix .NET Native runtime version being hard-coded --- external/runtime/runtime.depproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/runtime/runtime.depproj b/external/runtime/runtime.depproj index 8b72dedf4246..d277038506ce 100644 --- a/external/runtime/runtime.depproj +++ b/external/runtime/runtime.depproj @@ -16,7 +16,7 @@ - 1.1.0-beta-25128-00 + 1.1.0-$(ProjectNTfsExpectedPrerelease) From 9ec28fe148c6acadd10509cf4694ab6273b67e97 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 7 Apr 2017 15:38:03 -0700 Subject: [PATCH 05/11] Add NugetTargetMonikerShort to mono definition --- src/Tools/GenerateProps/targetgroups.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tools/GenerateProps/targetgroups.props b/src/Tools/GenerateProps/targetgroups.props index fe4cac6d0f72..d4b4f39fbbc3 100644 --- a/src/Tools/GenerateProps/targetgroups.props +++ b/src/Tools/GenerateProps/targetgroups.props @@ -217,6 +217,7 @@ .NETFramework,Version=v4.6.3 + net463 From 715f447bfe21f0e1387b776d66414b05889a4150 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 7 Apr 2017 16:05:31 -0700 Subject: [PATCH 06/11] Pass OSGroup to the restore command as well. --- Tools-Override/packageresolve.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools-Override/packageresolve.targets b/Tools-Override/packageresolve.targets index 27066086b18a..73eafe157605 100755 --- a/Tools-Override/packageresolve.targets +++ b/Tools-Override/packageresolve.targets @@ -37,7 +37,7 @@ <_DnuRestoreCommandRidPortion Condition="'$(RidSpecificAssets)' == 'true'">-r $(NuGetRuntimeIdentifier) - <_DnuRestoreCommandFull>$(DnuRestoreCommand) $(ProjectJson) /p:TargetGroup=$(TargetGroup) /p:ConfigurationGroup=$(ConfigurationGroup) /p:ArchGroup=$(ArchGroup) /p:TargetFramework=$(NuGetTargetMonikerShort) $(_DnuRestoreCommandRidPortion) + <_DnuRestoreCommandFull>$(DnuRestoreCommand) $(ProjectJson) /p:TargetGroup=$(TargetGroup) /p:ConfigurationGroup=$(ConfigurationGroup) /p:ArchGroup=$(ArchGroup) /p:OSGroup=$(OSGroup) /p:TargetFramework=$(NuGetTargetMonikerShort) $(_DnuRestoreCommandRidPortion) From fd2bd4edd3f86db00bae9fb0bf3b4ca9134fb341 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 7 Apr 2017 16:21:15 -0700 Subject: [PATCH 07/11] Fix folder version number used in src.builds to construct the test shared framework --- src/src.builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/src.builds b/src/src.builds index b019b1612721..697a346a8d85 100644 --- a/src/src.builds +++ b/src/src.builds @@ -12,7 +12,7 @@ - <_ToolsDotNetCliSharedFxPath>$(ToolsDir)dotnetcli\shared\Microsoft.NETCore.App\1.1.1 + <_ToolsDotNetCliSharedFxPath>$(ToolsDir)dotnetcli\shared\Microsoft.NETCore.App\2.0.0-preview1-001913-00 <_OriginalDepsJsonPath>$(_ToolsDotNetCliSharedFxPath)\Microsoft.NETCore.App.deps.json <_OutputTestSharedFrameworkDepsPath>$(NETCoreAppTestSharedFrameworkPath)\Microsoft.NETCore.App.deps.json From 26a2888d2584e85adbe102a40bd2e3b7d950ea12 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Mon, 10 Apr 2017 11:33:31 -0700 Subject: [PATCH 08/11] Use "microsoft.netcore.app" as the only "ExceptionForDepsJson" item. * This is necessary because in 2.0, the packages have been collapsed, so everything in the deps file appears under this one package. --- src/src.builds | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/src.builds b/src/src.builds index 697a346a8d85..4473384b3fa9 100644 --- a/src/src.builds +++ b/src/src.builds @@ -22,10 +22,7 @@ - - - - + Date: Mon, 10 Apr 2017 14:19:12 -0700 Subject: [PATCH 09/11] Hack around problem in GenerateDepsJson, update buildtools. After moving to the deps file from the 2.0 shared framework, there were some issues in running tests, because some files listed in the deps file are not present in our test shared framework. I've added some logic to the GenerateDepsJson file which removes these invalid items. --- BuildToolsVersion.txt | 2 +- src/Tools/CoreFx.Tools/GenerateDepsJson.cs | 37 +++++++++++++++++++--- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 4ae8a71983a5..9a13f2eab8da 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01431-02 +1.0.27-prerelease-01510-01 diff --git a/src/Tools/CoreFx.Tools/GenerateDepsJson.cs b/src/Tools/CoreFx.Tools/GenerateDepsJson.cs index 5429ab997b6f..b0694cf992c8 100644 --- a/src/Tools/CoreFx.Tools/GenerateDepsJson.cs +++ b/src/Tools/CoreFx.Tools/GenerateDepsJson.cs @@ -22,7 +22,7 @@ public FileNameAssemblyPair(AssemblyName assemblyName, string fileName) { AssemblyName = assemblyName; FileName = fileName; - } + } } public string RuntimeDirectory { get; set; } @@ -40,6 +40,7 @@ public override bool Execute() List filesInDir = Directory.EnumerateFiles(Path.GetDirectoryName(RuntimeDirectory)).ToList(); List assemblyNames = new List(); + List nonManagedAssemblyFilePaths = new List(); foreach (string file in filesInDir) { AssemblyName result; @@ -47,6 +48,10 @@ public override bool Execute() { assemblyNames.Add(new FileNameAssemblyPair(result, Path.GetFileNameWithoutExtension(file))); } + else + { + nonManagedAssemblyFilePaths.Add(Path.GetFileName(file)); + } } JObject newDepsJson = new JObject(); @@ -60,19 +65,41 @@ public override bool Execute() string runtimeTarget = newDepsJson["runtimeTarget"]["name"].ToString(); string rid = runtimeTarget.Split('/')[1]; - JObject targetsSection = (JObject) newDepsJson["targets"]; + JObject targetsSection = (JObject)newDepsJson["targets"]; JObject targetValue = new JObject(); JObject libraryValue = new JObject(); - + //Allow Exceptions to be preserved - JObject runtimeTargetSection = (JObject) targetsSection[runtimeTarget]; + JObject runtimeTargetSection = (JObject)targetsSection[runtimeTarget]; foreach (ITaskItem item in DepsExceptions) { foreach (var p in runtimeTargetSection.Properties()) { if (p.Name.Contains(item.ItemSpec)) { + // Based on the runtime being used, there will be some child property with a list of "native" dependencies. + // We need to filter this list to the set of files that are actually contained in our test folder, + // because the host will fail to launch if the deps file references missing files. + var childProps = p.Descendants().Where(jt => jt is JProperty).Select(jt2 => (JProperty)jt2); + var nativeSection = childProps.Where(jp => jp.Name == "native").SingleOrDefault(); + if (nativeSection != null) + { + List removedProperties = new List(); + foreach (var child in nativeSection.Value.Children()) + { + // If there is no matching file in our list, then remove it from the deps file. + if (!nonManagedAssemblyFilePaths.Any(s => child.Name.ToLowerInvariant().Contains(s.ToLowerInvariant()))) + { + removedProperties.Add(child); + } + } + foreach (var rp in removedProperties) + { + rp.Remove(); + } + } + targetValue.Add(p); libraryValue.Add(p.Name, ConstructLibraryNode()); } @@ -94,7 +121,7 @@ public override bool Execute() } catch (System.ArgumentException) { - + } try From ae68e07c7175f3ba9fdbeecb08c4720a3cd5fbf5 Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Mon, 10 Apr 2017 14:37:00 -0700 Subject: [PATCH 10/11] Migrate ToLower() fix into frameworkPackage.targets --- pkg/frameworkPackage.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/frameworkPackage.targets b/pkg/frameworkPackage.targets index e4f32593e94b..1ea4adedca33 100644 --- a/pkg/frameworkPackage.targets +++ b/pkg/frameworkPackage.targets @@ -70,9 +70,9 @@ - <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\*.dll" /> + <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\*.dll" /> - <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId)\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\MISSING_REF_BUILD" Condition="'@(_NETStandardFile)' == ''" /> + <_NETStandardFile Include="$(PackagesDir)$(NETStandardPackageId.ToLower())\$(NETStandardPackageVersion)\build\netstandard$(NETStandardVersion)\ref\MISSING_REF_BUILD" Condition="'@(_NETStandardFile)' == ''" /> <_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(File->'%(FileName)')" /> <_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" /> <_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" /> From d9a6f39f273ec76336d9816426e562656f6d49ed Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Mon, 10 Apr 2017 15:18:09 -0700 Subject: [PATCH 11/11] Remove Alpine build definitions from pipeline.json --- buildpipeline/pipeline.json | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 3a369e1772fb..f5a670f303ca 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -118,18 +118,6 @@ "Type": "build/product/", "ConfigurationGroup": "Release" } - }, - { - "Name": "DotNet-CoreFx-Trusted-Linux", - "Parameters": { - "PB_DockerTag": "alpine_prereqs", - "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=Release /p:\"EnableCloudTest=false\" /p:\"TestProduct=corefx /p:\"TimeoutInSeconds=1200\" /p:\"TargetOS=Linux\"" - }, - "ReportingParameters": { - "OperatingSystem": "Alpine 3.4.3", - "Type": "build/product/", - "ConfigurationGroup": "Release" - } } ] }, @@ -628,18 +616,6 @@ "Type": "build/product/", "ConfigurationGroup": "Debug" } - }, - { - "Name": "DotNet-CoreFx-Trusted-Linux", - "Parameters": { - "PB_DockerTag": "alpine_prereqs", - "PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=Debug /p:\"EnableCloudTest=false\" /p:\"TestProduct=corefx /p:\"TimeoutInSeconds=1200\" /p:\"TargetOS=Linux\"" - }, - "ReportingParameters": { - "OperatingSystem": "Alpine 3.4.3", - "Type": "build/product/", - "ConfigurationGroup": "Debug" - } } ] },