From 76178e9c49e56525fd32155c13ea02483697aa2b Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Wed, 19 Apr 2017 18:21:55 -0500 Subject: [PATCH 001/198] Disable publish to Azure for testing release/2.0.0 builds. This change will be reverted after testing is complete --- buildpipeline/Core-Setup-CrossBuild.json | 2 +- buildpipeline/Core-Setup-Linux.json | 2 +- buildpipeline/Core-Setup-OSX-x64.json | 2 +- buildpipeline/Core-Setup-PortableLinux-x64.json | 2 +- buildpipeline/Core-Setup-RHEL7-x64.json | 2 +- buildpipeline/Core-Setup-Signing-Windows-x64.json | 4 ++-- buildpipeline/Core-Setup-Signing-Windows-x86.json | 4 ++-- buildpipeline/Core-Setup-Windows-arm32.json | 2 +- buildpipeline/Core-Setup-Windows-arm64.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildpipeline/Core-Setup-CrossBuild.json b/buildpipeline/Core-Setup-CrossBuild.json index 84c624c7..e5abc257 100644 --- a/buildpipeline/Core-Setup-CrossBuild.json +++ b/buildpipeline/Core-Setup-CrossBuild.json @@ -251,7 +251,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "REPO_ID": { diff --git a/buildpipeline/Core-Setup-Linux.json b/buildpipeline/Core-Setup-Linux.json index 2de3dea3..06434212 100644 --- a/buildpipeline/Core-Setup-Linux.json +++ b/buildpipeline/Core-Setup-Linux.json @@ -207,7 +207,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-OSX-x64.json b/buildpipeline/Core-Setup-OSX-x64.json index 1cd99bc4..08a8e4fb 100644 --- a/buildpipeline/Core-Setup-OSX-x64.json +++ b/buildpipeline/Core-Setup-OSX-x64.json @@ -154,7 +154,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-PortableLinux-x64.json b/buildpipeline/Core-Setup-PortableLinux-x64.json index 5626f166..3d8392b7 100644 --- a/buildpipeline/Core-Setup-PortableLinux-x64.json +++ b/buildpipeline/Core-Setup-PortableLinux-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-RHEL7-x64.json b/buildpipeline/Core-Setup-RHEL7-x64.json index 4fc44bae..7998aa14 100644 --- a/buildpipeline/Core-Setup-RHEL7-x64.json +++ b/buildpipeline/Core-Setup-RHEL7-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index 0a0417cd..4aa6bc90 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -353,7 +353,7 @@ } }, { - "enabled": true, + "enabled": false, "continueOnError": false, "alwaysRun": false, "displayName": "Perform Cleanup Tasks", @@ -466,7 +466,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true" + "value": "false" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Signing-Windows-x86.json b/buildpipeline/Core-Setup-Signing-Windows-x86.json index dd712eaa..3b3cd709 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x86.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x86.json @@ -339,7 +339,7 @@ "inputs": {} }, { - "enabled": true, + "enabled": false, "continueOnError": false, "alwaysRun": false, "displayName": "Publish Build Artifacts", @@ -439,7 +439,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true" + "value": "false" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Windows-arm32.json b/buildpipeline/Core-Setup-Windows-arm32.json index d09b53d0..7bed0af7 100644 --- a/buildpipeline/Core-Setup-Windows-arm32.json +++ b/buildpipeline/Core-Setup-Windows-arm32.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "PB_PortableBuild": { diff --git a/buildpipeline/Core-Setup-Windows-arm64.json b/buildpipeline/Core-Setup-Windows-arm64.json index 7dbb7510..b46c30ce 100644 --- a/buildpipeline/Core-Setup-Windows-arm64.json +++ b/buildpipeline/Core-Setup-Windows-arm64.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "PB_PortableBuild": { From 4483ba6661a48a3eb8513ae47be0a354b33762da Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Thu, 20 Apr 2017 09:28:29 -0500 Subject: [PATCH 002/198] Add a dummy commit. --- Documentation/dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dummy.txt b/Documentation/dummy.txt index 99bb40e9..0d1a7a27 100644 --- a/Documentation/dummy.txt +++ b/Documentation/dummy.txt @@ -1 +1 @@ -4/10/2017 09:03:50 AM +Thursday, April 20, 2017 9:27:39 AM \ No newline at end of file From 3ae8be4870a0ba4ea534ecff6bac7a743673d340 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Fri, 21 Apr 2017 12:53:16 -0500 Subject: [PATCH 003/198] Update branch info to release/2.0.0. --- branchinfo.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index 21e76bf0..e96c6231 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -7,5 +7,5 @@ PATCH_VERSION=0 STABILIZE_PACKAGE_VERSION=false LOCK_HOST_VERSION=false RELEASE_SUFFIX=preview1 -CHANNEL=master -BRANCH_NAME=master +CHANNEL=release/2.0.0 +BRANCH_NAME=release/2.0.0 From 55cde1d1bf29f29a3c14f8f78fe904c74b872411 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 24 Apr 2017 11:13:39 -0500 Subject: [PATCH 004/198] Auto-update release/2.0.0 from 2.0.0 branches --- build_projects/update-dependencies/Config.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build_projects/update-dependencies/Config.cs b/build_projects/update-dependencies/Config.cs index fd6f7703..471e5612 100644 --- a/build_projects/update-dependencies/Config.cs +++ b/build_projects/update-dependencies/Config.cs @@ -36,9 +36,9 @@ namespace Microsoft.DotNet.Scripts private Lazy _userName = new Lazy(() => GetEnvironmentVariable("GITHUB_USER")); private Lazy _email = new Lazy(() => GetEnvironmentVariable("GITHUB_EMAIL")); private Lazy _password = new Lazy(() => GetEnvironmentVariable("GITHUB_PASSWORD")); - private Lazy _coreFxVersionUrl = new Lazy(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/master/")); - private Lazy _coreClrVersionUrl = new Lazy(() => GetEnvironmentVariable("CORECLR_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/coreclr/master/")); - private Lazy _standardVersionUrl = new Lazy(() => GetEnvironmentVariable("STANDARD_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/standard/master/")); + private Lazy _coreFxVersionUrl = new Lazy(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/2.0.0/")); + private Lazy _coreClrVersionUrl = new Lazy(() => GetEnvironmentVariable("CORECLR_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/coreclr/release/2.0.0/")); + private Lazy _standardVersionUrl = new Lazy(() => GetEnvironmentVariable("STANDARD_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/standard/release/2.0.0/")); private Lazy _gitHubOriginOwner; private Lazy _gitHubUpstreamOwner = new Lazy(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet")); private Lazy _gitHubProject = new Lazy(() => GetEnvironmentVariable("GITHUB_PROJECT", "core-setup")); From f53d17aad2c6b734382badd8468ae96d3183c21b Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 25 Apr 2017 07:50:23 -0700 Subject: [PATCH 005/198] Update CoreClr, CoreFx, Standard to preview1-25225-02, preview1-25225-02, preview1-25225-02, respectively (#2149) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 8 ++++---- .../project.json.template | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 6eb919ed..4f62fe63 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25221-02"; - public static readonly string JitVersion = "2.0.0-preview1-25221-02"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25225-02"; + public static readonly string JitVersion = "2.0.0-preview1-25225-02"; } } diff --git a/pkg/deps/project.json b/pkg/deps/project.json index f751b68f..70a36f72 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-02" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index 25d64e5c..842b979f 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25221-02\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25225-02\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index 7564507e..040a1c7d 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25221-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-02", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25225-02", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-02", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-02", - "NETStandard.Library": "2.0.0-preview1-25221-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02", + "NETStandard.Library": "2.0.0-preview1-25225-02" }, "frameworks": { "netcoreapp2.0": {} diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index dc0c9872..a8eaa228 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25221-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-02", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-02", - "NETStandard.Library": "2.0.0-preview1-25221-01", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25225-02", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-02", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02", + "NETStandard.Library": "2.0.0-preview1-25225-02", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", "System.ServiceModel.NetTcp": "4.4.0-beta-25205-01", From a715628fa099541bac0e58978800a52bbd10064f Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Tue, 25 Apr 2017 10:50:56 -0500 Subject: [PATCH 006/198] Revert "Disable publish to Azure for testing release/2.0.0 builds." This reverts commit 76178e9c49e56525fd32155c13ea02483697aa2b. --- buildpipeline/Core-Setup-CrossBuild.json | 2 +- buildpipeline/Core-Setup-Linux.json | 2 +- buildpipeline/Core-Setup-OSX-x64.json | 2 +- buildpipeline/Core-Setup-PortableLinux-x64.json | 2 +- buildpipeline/Core-Setup-RHEL7-x64.json | 2 +- buildpipeline/Core-Setup-Signing-Windows-x64.json | 4 ++-- buildpipeline/Core-Setup-Signing-Windows-x86.json | 4 ++-- buildpipeline/Core-Setup-Windows-arm32.json | 2 +- buildpipeline/Core-Setup-Windows-arm64.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildpipeline/Core-Setup-CrossBuild.json b/buildpipeline/Core-Setup-CrossBuild.json index e5abc257..84c624c7 100644 --- a/buildpipeline/Core-Setup-CrossBuild.json +++ b/buildpipeline/Core-Setup-CrossBuild.json @@ -251,7 +251,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "REPO_ID": { diff --git a/buildpipeline/Core-Setup-Linux.json b/buildpipeline/Core-Setup-Linux.json index 06434212..2de3dea3 100644 --- a/buildpipeline/Core-Setup-Linux.json +++ b/buildpipeline/Core-Setup-Linux.json @@ -207,7 +207,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-OSX-x64.json b/buildpipeline/Core-Setup-OSX-x64.json index 08a8e4fb..1cd99bc4 100644 --- a/buildpipeline/Core-Setup-OSX-x64.json +++ b/buildpipeline/Core-Setup-OSX-x64.json @@ -154,7 +154,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-PortableLinux-x64.json b/buildpipeline/Core-Setup-PortableLinux-x64.json index 3d8392b7..5626f166 100644 --- a/buildpipeline/Core-Setup-PortableLinux-x64.json +++ b/buildpipeline/Core-Setup-PortableLinux-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-RHEL7-x64.json b/buildpipeline/Core-Setup-RHEL7-x64.json index 7998aa14..4fc44bae 100644 --- a/buildpipeline/Core-Setup-RHEL7-x64.json +++ b/buildpipeline/Core-Setup-RHEL7-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index 6e395f3f..d973401c 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -353,7 +353,7 @@ } }, { - "enabled": false, + "enabled": true, "continueOnError": false, "alwaysRun": false, "displayName": "Perform Cleanup Tasks", @@ -466,7 +466,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false" + "value": "true" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Signing-Windows-x86.json b/buildpipeline/Core-Setup-Signing-Windows-x86.json index fbf099fb..ade23e6f 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x86.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x86.json @@ -339,7 +339,7 @@ "inputs": {} }, { - "enabled": false, + "enabled": true, "continueOnError": false, "alwaysRun": false, "displayName": "Publish Build Artifacts", @@ -439,7 +439,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false" + "value": "true" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Windows-arm32.json b/buildpipeline/Core-Setup-Windows-arm32.json index 7bed0af7..d09b53d0 100644 --- a/buildpipeline/Core-Setup-Windows-arm32.json +++ b/buildpipeline/Core-Setup-Windows-arm32.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "PB_PortableBuild": { diff --git a/buildpipeline/Core-Setup-Windows-arm64.json b/buildpipeline/Core-Setup-Windows-arm64.json index b46c30ce..7dbb7510 100644 --- a/buildpipeline/Core-Setup-Windows-arm64.json +++ b/buildpipeline/Core-Setup-Windows-arm64.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "PB_PortableBuild": { From 7dec72d7c1f74629c6107ccc14159c4627a6da91 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Tue, 25 Apr 2017 10:52:08 -0500 Subject: [PATCH 007/198] Revert "Revert "Disable publish to Azure for testing release/2.0.0 builds."" This reverts commit a715628fa099541bac0e58978800a52bbd10064f. --- buildpipeline/Core-Setup-CrossBuild.json | 2 +- buildpipeline/Core-Setup-Linux.json | 2 +- buildpipeline/Core-Setup-OSX-x64.json | 2 +- buildpipeline/Core-Setup-PortableLinux-x64.json | 2 +- buildpipeline/Core-Setup-RHEL7-x64.json | 2 +- buildpipeline/Core-Setup-Signing-Windows-x64.json | 4 ++-- buildpipeline/Core-Setup-Signing-Windows-x86.json | 4 ++-- buildpipeline/Core-Setup-Windows-arm32.json | 2 +- buildpipeline/Core-Setup-Windows-arm64.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildpipeline/Core-Setup-CrossBuild.json b/buildpipeline/Core-Setup-CrossBuild.json index 84c624c7..e5abc257 100644 --- a/buildpipeline/Core-Setup-CrossBuild.json +++ b/buildpipeline/Core-Setup-CrossBuild.json @@ -251,7 +251,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "REPO_ID": { diff --git a/buildpipeline/Core-Setup-Linux.json b/buildpipeline/Core-Setup-Linux.json index 2de3dea3..06434212 100644 --- a/buildpipeline/Core-Setup-Linux.json +++ b/buildpipeline/Core-Setup-Linux.json @@ -207,7 +207,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-OSX-x64.json b/buildpipeline/Core-Setup-OSX-x64.json index 1cd99bc4..08a8e4fb 100644 --- a/buildpipeline/Core-Setup-OSX-x64.json +++ b/buildpipeline/Core-Setup-OSX-x64.json @@ -154,7 +154,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-PortableLinux-x64.json b/buildpipeline/Core-Setup-PortableLinux-x64.json index 5626f166..3d8392b7 100644 --- a/buildpipeline/Core-Setup-PortableLinux-x64.json +++ b/buildpipeline/Core-Setup-PortableLinux-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-RHEL7-x64.json b/buildpipeline/Core-Setup-RHEL7-x64.json index 4fc44bae..7998aa14 100644 --- a/buildpipeline/Core-Setup-RHEL7-x64.json +++ b/buildpipeline/Core-Setup-RHEL7-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index d973401c..6e395f3f 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -353,7 +353,7 @@ } }, { - "enabled": true, + "enabled": false, "continueOnError": false, "alwaysRun": false, "displayName": "Perform Cleanup Tasks", @@ -466,7 +466,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true" + "value": "false" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Signing-Windows-x86.json b/buildpipeline/Core-Setup-Signing-Windows-x86.json index ade23e6f..fbf099fb 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x86.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x86.json @@ -339,7 +339,7 @@ "inputs": {} }, { - "enabled": true, + "enabled": false, "continueOnError": false, "alwaysRun": false, "displayName": "Publish Build Artifacts", @@ -439,7 +439,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true" + "value": "false" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Windows-arm32.json b/buildpipeline/Core-Setup-Windows-arm32.json index d09b53d0..7bed0af7 100644 --- a/buildpipeline/Core-Setup-Windows-arm32.json +++ b/buildpipeline/Core-Setup-Windows-arm32.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "PB_PortableBuild": { diff --git a/buildpipeline/Core-Setup-Windows-arm64.json b/buildpipeline/Core-Setup-Windows-arm64.json index 7dbb7510..b46c30ce 100644 --- a/buildpipeline/Core-Setup-Windows-arm64.json +++ b/buildpipeline/Core-Setup-Windows-arm64.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "false", "allowOverride": true }, "PB_PortableBuild": { From 50d16f773f49d0b85e8a5309ae5fd2045e195563 Mon Sep 17 00:00:00 2001 From: Ravi Eda Date: Tue, 25 Apr 2017 10:52:58 -0500 Subject: [PATCH 008/198] Revert "Revert "Revert "Disable publish to Azure for testing release/2.0.0 builds.""" This reverts commit 7dec72d7c1f74629c6107ccc14159c4627a6da91. --- buildpipeline/Core-Setup-CrossBuild.json | 2 +- buildpipeline/Core-Setup-Linux.json | 2 +- buildpipeline/Core-Setup-OSX-x64.json | 2 +- buildpipeline/Core-Setup-PortableLinux-x64.json | 2 +- buildpipeline/Core-Setup-RHEL7-x64.json | 2 +- buildpipeline/Core-Setup-Signing-Windows-x64.json | 4 ++-- buildpipeline/Core-Setup-Signing-Windows-x86.json | 4 ++-- buildpipeline/Core-Setup-Windows-arm32.json | 2 +- buildpipeline/Core-Setup-Windows-arm64.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildpipeline/Core-Setup-CrossBuild.json b/buildpipeline/Core-Setup-CrossBuild.json index e5abc257..84c624c7 100644 --- a/buildpipeline/Core-Setup-CrossBuild.json +++ b/buildpipeline/Core-Setup-CrossBuild.json @@ -251,7 +251,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "REPO_ID": { diff --git a/buildpipeline/Core-Setup-Linux.json b/buildpipeline/Core-Setup-Linux.json index 06434212..2de3dea3 100644 --- a/buildpipeline/Core-Setup-Linux.json +++ b/buildpipeline/Core-Setup-Linux.json @@ -207,7 +207,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-OSX-x64.json b/buildpipeline/Core-Setup-OSX-x64.json index 08a8e4fb..1cd99bc4 100644 --- a/buildpipeline/Core-Setup-OSX-x64.json +++ b/buildpipeline/Core-Setup-OSX-x64.json @@ -154,7 +154,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-PortableLinux-x64.json b/buildpipeline/Core-Setup-PortableLinux-x64.json index 3d8392b7..5626f166 100644 --- a/buildpipeline/Core-Setup-PortableLinux-x64.json +++ b/buildpipeline/Core-Setup-PortableLinux-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-RHEL7-x64.json b/buildpipeline/Core-Setup-RHEL7-x64.json index 7998aa14..4fc44bae 100644 --- a/buildpipeline/Core-Setup-RHEL7-x64.json +++ b/buildpipeline/Core-Setup-RHEL7-x64.json @@ -214,7 +214,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_FEED_URL": { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index 6e395f3f..d973401c 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -353,7 +353,7 @@ } }, { - "enabled": false, + "enabled": true, "continueOnError": false, "alwaysRun": false, "displayName": "Perform Cleanup Tasks", @@ -466,7 +466,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false" + "value": "true" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Signing-Windows-x86.json b/buildpipeline/Core-Setup-Signing-Windows-x86.json index fbf099fb..ade23e6f 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x86.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x86.json @@ -339,7 +339,7 @@ "inputs": {} }, { - "enabled": false, + "enabled": true, "continueOnError": false, "alwaysRun": false, "displayName": "Publish Build Artifacts", @@ -439,7 +439,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false" + "value": "true" }, "NUGET_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" diff --git a/buildpipeline/Core-Setup-Windows-arm32.json b/buildpipeline/Core-Setup-Windows-arm32.json index 7bed0af7..d09b53d0 100644 --- a/buildpipeline/Core-Setup-Windows-arm32.json +++ b/buildpipeline/Core-Setup-Windows-arm32.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "PB_PortableBuild": { diff --git a/buildpipeline/Core-Setup-Windows-arm64.json b/buildpipeline/Core-Setup-Windows-arm64.json index b46c30ce..7dbb7510 100644 --- a/buildpipeline/Core-Setup-Windows-arm64.json +++ b/buildpipeline/Core-Setup-Windows-arm64.json @@ -123,7 +123,7 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "false", + "value": "true", "allowOverride": true }, "PB_PortableBuild": { From b59e160ba672cc54a28dfa2a967e60efaa770d7e Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Tue, 25 Apr 2017 10:44:15 -0700 Subject: [PATCH 009/198] Port fix for 2157 (#2164) * Port fix for 2157 * Fix test to reference Preview1 M.N.App --- .../TestProjects/ResourceLookup/Program.cs | 12 + .../ResourceLookup/ResourceLookup.xproj | 19 + .../TestProjects/ResourceLookup/project.json | 386 ++++++++++++++++++ src/corehost/cli/deps_entry.cpp | 11 +- .../GivenThatICareAboutResourceLookup.cs | 90 ++++ 5 files changed, 513 insertions(+), 5 deletions(-) create mode 100644 TestAssets/TestProjects/ResourceLookup/Program.cs create mode 100644 TestAssets/TestProjects/ResourceLookup/ResourceLookup.xproj create mode 100644 TestAssets/TestProjects/ResourceLookup/project.json create mode 100644 test/HostActivationTests/GivenThatICareAboutResourceLookup.cs diff --git a/TestAssets/TestProjects/ResourceLookup/Program.cs b/TestAssets/TestProjects/ResourceLookup/Program.cs new file mode 100644 index 00000000..a8dcbdd7 --- /dev/null +++ b/TestAssets/TestProjects/ResourceLookup/Program.cs @@ -0,0 +1,12 @@ +using System; + +namespace ResourceLookup +{ + public static class Program + { + public static void Main(string[] args) + { + Console.WriteLine("Hello World!"); + } + } +} diff --git a/TestAssets/TestProjects/ResourceLookup/ResourceLookup.xproj b/TestAssets/TestProjects/ResourceLookup/ResourceLookup.xproj new file mode 100644 index 00000000..ec4227a0 --- /dev/null +++ b/TestAssets/TestProjects/ResourceLookup/ResourceLookup.xproj @@ -0,0 +1,19 @@ + + + + 14.0.25123 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + e484fcd8-e438-4559-a745-e58574263ffd + ResourceLookup + .\obj + .\bin\ + + + + 2.0 + + + \ No newline at end of file diff --git a/TestAssets/TestProjects/ResourceLookup/project.json b/TestAssets/TestProjects/ResourceLookup/project.json new file mode 100644 index 00000000..d58b265a --- /dev/null +++ b/TestAssets/TestProjects/ResourceLookup/project.json @@ -0,0 +1,386 @@ +{ + + "buildOptions": { + "emitEntryPoint": true + }, + "dependencies": {}, + "frameworks": { + "netcoreapp2.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "type": "platform", + "version": "2.0.0-preview1-*" + }, + "System.Spatial": "5.8.2", + "Microsoft.CodeAnalysis.Analyzers": { + "version": "1.1.0", + "exclude": "all" + }, + "Microsoft.CSharp": { + "version": "4.3.0", + "exclude": "all" + }, + "Microsoft.DiaSymReader.Native": { + "version": "1.4.0", + "exclude": "all" + }, + "Microsoft.VisualBasic": { + "version": "10.1.0", + "exclude": "all" + }, + "Microsoft.Win32.Primitives": { + "version": "4.3.0", + "exclude": "all" + }, + "Microsoft.Win32.Registry": { + "version": "4.3.0", + "exclude": "all" + }, + "System.AppContext": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Buffers": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Collections": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Collections.Concurrent": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Collections.Immutable": { + "version": "1.3.0", + "exclude": "all" + }, + "System.ComponentModel": { + "version": "4.3.0", + "exclude": "all" + }, + "System.ComponentModel.Annotations": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Console": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Diagnostics.Debug": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Diagnostics.DiagnosticSource": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Diagnostics.FileVersionInfo": { + "version": "4.0.0", + "exclude": "all" + }, + "System.Diagnostics.Process": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Diagnostics.StackTrace": { + "version": "4.0.1", + "exclude": "all" + }, + "System.Diagnostics.Tools": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Diagnostics.Tracing": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Dynamic.Runtime": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Globalization": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Globalization.Calendars": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Globalization.Extensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.Compression": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.Compression.ZipFile": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.FileSystem": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.FileSystem.Primitives": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.FileSystem.Watcher": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.MemoryMappedFiles": { + "version": "4.3.0", + "exclude": "all" + }, + "System.IO.UnmanagedMemoryStream": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Linq": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Linq.Expressions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Linq.Parallel": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Linq.Queryable": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.Http": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.NameResolution": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.Primitives": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.Requests": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.Security": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.Sockets": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Net.WebHeaderCollection": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Numerics.Vectors": { + "version": "4.3.0", + "exclude": "all" + }, + "System.ObjectModel": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.DispatchProxy": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.Emit": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.Emit.ILGeneration": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.Emit.Lightweight": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.Extensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.Metadata": { + "version": "1.4.1", + "exclude": "all" + }, + "System.Reflection.Primitives": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Reflection.TypeExtensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Resources.Reader": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Resources.ResourceManager": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.Extensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.Handles": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.InteropServices": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.InteropServices.RuntimeInformation": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.Loader": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Runtime.Numerics": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Claims": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.Algorithms": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.Cng": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.Csp": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.Encoding": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.OpenSsl": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.Primitives": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Cryptography.X509Certificates": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Principal": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Security.Principal.Windows": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Text.Encoding": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Text.Encoding.CodePages": { + "version": "4.0.1", + "exclude": "all" + }, + "System.Text.Encoding.Extensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Text.RegularExpressions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Overlapped": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Tasks": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Tasks.Dataflow": { + "version": "4.7.0", + "exclude": "all" + }, + "System.Threading.Tasks.Extensions": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Tasks.Parallel": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Thread": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.ThreadPool": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Threading.Timer": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Xml.ReaderWriter": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Xml.XDocument": { + "version": "4.3.0", + "exclude": "all" + }, + "System.Xml.XmlDocument": { + "version": "4.0.1", + "exclude": "all" + }, + "System.Xml.XPath": { + "version": "4.0.1", + "exclude": "all" + }, + "System.Xml.XPath.XDocument": { + "version": "4.0.1", + "exclude": "all" + } + } + } + } +} diff --git a/src/corehost/cli/deps_entry.cpp b/src/corehost/cli/deps_entry.cpp index fe3eeacc..702ef78a 100644 --- a/src/corehost/cli/deps_entry.cpp +++ b/src/corehost/cli/deps_entry.cpp @@ -70,17 +70,18 @@ bool deps_entry_t::to_dir_path(const pal::string_t& base, pal::string_t* str) co replace_char(&pal_relative_path, _X('/'), DIR_SEPARATOR); } - // Resources are represented as "/" in the deps.json. + // Resources are represented as "lib///" in the deps.json. // The is the "directory" in the pal_relative_path below, so extract it. pal::string_t ietf_dir = get_directory(pal_relative_path); pal::string_t ietf = ietf_dir; // get_directory returns with DIR_SEPERATOR appended that we need to remove. - auto sep_pos = ietf.find_last_of(DIR_SEPARATOR); - if (sep_pos != pal::string_t::npos) - { - ietf = ietf.erase(sep_pos, pal::string_t::npos); + if (ietf.back() == DIR_SEPARATOR) { + ietf.pop_back(); } + + // Extract IETF code from "lib//" + ietf = get_filename(ietf); pal::string_t base_ietf_dir = base; append_path(&base_ietf_dir, ietf.c_str()); diff --git a/test/HostActivationTests/GivenThatICareAboutResourceLookup.cs b/test/HostActivationTests/GivenThatICareAboutResourceLookup.cs new file mode 100644 index 00000000..e29d6489 --- /dev/null +++ b/test/HostActivationTests/GivenThatICareAboutResourceLookup.cs @@ -0,0 +1,90 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Runtime.InteropServices; +using System.Text.RegularExpressions; +using Xunit; +using FluentAssertions; +using Microsoft.DotNet.CoreSetup.Test; + +namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.ResourceLookup +{ + public class GivenThatICareAboutResourceLookup + { + private static TestProjectFixture PreviouslyBuiltAndRestoredResourceLookupTestProjectFixture { get; set; } + private static TestProjectFixture PreviouslyPublishedAndRestoredResourceLookupTestProjectFixture { get; set; } + private static RepoDirectoriesProvider RepoDirectories { get; set; } + + static GivenThatICareAboutResourceLookup() + { + RepoDirectories = new RepoDirectoriesProvider(); + + PreviouslyBuiltAndRestoredResourceLookupTestProjectFixture = new TestProjectFixture("ResourceLookup", RepoDirectories) + .EnsureRestored(RepoDirectories.CorehostPackages) + .BuildProject(); + + PreviouslyPublishedAndRestoredResourceLookupTestProjectFixture = new TestProjectFixture("ResourceLookup", RepoDirectories) + .EnsureRestored(RepoDirectories.CorehostPackages) + .PublishProject(); + } + + [Fact] + public void Muxer_activation_of_Build_Output_Resource_DLL_with_DepsJson_and_RuntimeConfig_Local_Succeeds() + { + var fixture = PreviouslyBuiltAndRestoredResourceLookupTestProjectFixture + .Copy(); + + var dotnet = fixture.BuiltDotnet; + var appDll = fixture.TestProject.AppDll; + + dotnet.Exec(appDll) + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World"); + + dotnet.Exec("exec", appDll) + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World"); + } + + [Fact] + public void Muxer_activation_of_Publish_Output_ResourceLookup_DLL_with_DepsJson_and_RuntimeConfig_Local_Succeeds() + { + var fixture = PreviouslyPublishedAndRestoredResourceLookupTestProjectFixture + .Copy(); + + var dotnet = fixture.BuiltDotnet; + var appDll = fixture.TestProject.AppDll; + + dotnet.Exec(appDll) + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World"); + + dotnet.Exec("exec", appDll) + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World"); + } + } +} From c270bb63ec21633306a0414c0438685050715d47 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 25 Apr 2017 11:54:09 -0700 Subject: [PATCH 010/198] Fix casing of OfficialBuildRID (#2168) Working around https://github.com/Microsoft/msbuild/issues/1751 Cherry-pick of 6341fc68f53e6a96c4b0f3107bbc4782867d995b Conflicts: pkg/projects/netcoreappRIDs.props --- pkg/projects/netcoreappRIDs.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index b09f79ae..dbb75157 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -16,9 +16,9 @@ - + armel - + @@ -51,9 +51,9 @@ arm - + armel - + \ No newline at end of file From 6a54f7acd1b3cd93868730e33f0809f959d19517 Mon Sep 17 00:00:00 2001 From: Nick Guerrera Date: Fri, 21 Apr 2017 16:31:11 -0700 Subject: [PATCH 011/198] Export SDK resolution (cherry picked from commit 826a5c943ac6a88f07edc954f1721c9e5b11636f) --- src/corehost/cli/fxr/fx_muxer.cpp | 27 ++++++--- src/corehost/cli/fxr/fx_muxer.h | 1 + src/corehost/cli/fxr/hostfxr.cpp | 93 +++++++++++++++++++++++++++++++ src/corehost/common/pal.h | 1 + 4 files changed, 115 insertions(+), 7 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 0cb7be91..ee393515 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -600,8 +600,20 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::stri { trace::verbose(_X("--- Resolving dotnet from working dir")); pal::string_t cwd; + if (!pal::getcwd(&cwd)) + { + trace::verbose(_X("Failed to obtain current working dir")); + assert(cwd.empty()); + } + + return resolve_sdk_dotnet_path(own_dir, cwd, cli_sdk); +} + +bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal::string_t& cwd, pal::string_t* cli_sdk) +{ pal::string_t global; - if (pal::getcwd(&cwd)) + + if (!cwd.empty()) { for (pal::string_t parent_dir, cur_dir = cwd; true; cur_dir = parent_dir) { @@ -623,10 +635,6 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::stri } } } - else - { - trace::verbose(_X("Failed to obtain current working dir")); - } std::vector hive_dir; pal::string_t local_dir; @@ -635,7 +643,7 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::stri if (multilevel_lookup) { - if (pal::getcwd(&cwd)) + if (!cwd.empty()) { hive_dir.push_back(cwd); } @@ -644,7 +652,12 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::stri hive_dir.push_back(local_dir); } } - hive_dir.push_back(own_dir); + + if (!own_dir.empty()) + { + hive_dir.push_back(own_dir); + } + if (multilevel_lookup && pal::get_global_dotnet_dir(&global_dir)) { hive_dir.push_back(global_dir); diff --git a/src/corehost/cli/fxr/fx_muxer.h b/src/corehost/cli/fxr/fx_muxer.h index 7a7e960e..5fbae1c2 100644 --- a/src/corehost/cli/fxr/fx_muxer.h +++ b/src/corehost/cli/fxr/fx_muxer.h @@ -18,6 +18,7 @@ class fx_muxer_t public: static int execute(const int argc, const pal::char_t* argv[]); static std::vector get_known_opts(bool exec_mode, host_mode_t mode, bool get_all_options = false); + static bool resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal::string_t& cwd, pal::string_t* cli_sdk); private: static int read_config_and_execute( const pal::string_t& own_dir, diff --git a/src/corehost/cli/fxr/hostfxr.cpp b/src/corehost/cli/fxr/hostfxr.cpp index 32028d31..73f8a85c 100644 --- a/src/corehost/cli/fxr/hostfxr.cpp +++ b/src/corehost/cli/fxr/hostfxr.cpp @@ -99,3 +99,96 @@ SHARED_API int hostfxr_main(const int argc, const pal::char_t* argv[]) return muxer.execute(argc, argv); } +// +// Determines the directory location of the SDK accounting for +// global.json and multi-level lookup policy. +// +// Invoked via MSBuild SDK resolver to locate SDK props and targets +// from an msbuild other than the one bundled by the CLI. +// +// Parameters: +// exe_dir +// The main directory where SDKs are located in sdk\[version] +// sub-folders. Pass the directory of a dotnet executable to +// mimic how that executable would search in its own directory. +// It is also valid to pass nullptr or empty, in which case +// multi-level lookup can still search other locations if +// it has not been disabled by the user's environment. +// +// working_dir +// The directory where the search for global.json (which can +// control the resolved SDK version) starts and proceeds +// upwards. This directory may also be searched for SDKs if +// multi-level lookup has not been disabled by the user's +// environment. This mimics the current working directory's +// interpretation when the dotnet exectuable resolves the SDK +// for CLI commands. +// +// buffer +// The buffer where the resolved SDK path will be written. +// +// buffer_size +// The size of the buffer argument in pal::char_t units. +// +// Return value: +// <0 - Invalid argument +// 0 - SDK could not be found. +// >0 - The number of characters (including null terminator) +// required to store the located SDK. +// +// If resolution succeeds and the positive return value is less than +// or equal to buffer_size (i.e. the the buffer is large enough), +// then the resolved SDK path is copied to the buffer and null +// terminated. Otherwise, no data is written to the buffer. +// +// String encoding: +// Windows - UTF-16 (pal::char_t is 2 byte wchar_t) +// Unix - UTF-8 (pal::char_t is 1 byte char) +// +SHARED_API int32_t hostfxr_resolve_sdk( + const pal::char_t* exe_dir, + const pal::char_t* working_dir, + pal::char_t buffer[], + int32_t buffer_size) +{ + trace::setup(); + + trace::info(_X("--- Invoked hostfxr [commit hash: %s] hostfxr_resolve_sdk"), _STRINGIFY(REPO_COMMIT_HASH)); + + if (buffer_size < 0 || (buffer_size > 0 && buffer == nullptr)) + { + trace::error(_X("hostfxr_resolve_sdk received an invalid argument.")); + return -1; + } + + if (exe_dir == nullptr) + { + exe_dir = _X(""); + } + + if (working_dir == nullptr) + { + working_dir = _X(""); + } + + pal::string_t cli_sdk; + if (!fx_muxer_t::resolve_sdk_dotnet_path(exe_dir, working_dir, &cli_sdk)) + { + // fx_muxer_t::resolve_sdk_dotnet_path handles tracing for this error case. + return 0; + } + + if (cli_sdk.size() < buffer_size) + { + size_t length = cli_sdk.copy(buffer, buffer_size - 1); + assert(length == cli_sdk.size()); + assert(length < buffer_size); + buffer[length] = 0; + } + else + { + trace::info(_X("hostfxr_resolve_sdk received a buffer that is too small to hold the located SDK path.")); + } + + return cli_sdk.size() + 1; +} diff --git a/src/corehost/common/pal.h b/src/corehost/common/pal.h index 3cdcbdac..3d830e94 100644 --- a/src/corehost/common/pal.h +++ b/src/corehost/common/pal.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include From 24325a20aa866f11d06730e5948e9c4294bec814 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 21 Apr 2017 16:30:01 -0500 Subject: [PATCH 012/198] Disable non-portable windows and osx builds. --- README.md | 138 +++++++----------- .../dotnet-host-build/PublishTargets.cs | 10 -- .../Core-Setup-Signing-Windows-x64.json | 4 +- .../Core-Setup-Signing-Windows-x86.json | 2 +- buildpipeline/pipeline.json | 49 +------ pkg/projects/netcoreappRIDs.props | 11 -- 6 files changed, 60 insertions(+), 154 deletions(-) diff --git a/README.md b/README.md index c6fa1188..df216be6 100644 --- a/README.md +++ b/README.md @@ -10,33 +10,6 @@ The all-up installation experience is described in the [installation scenarios]( document in the dotnet/cli repo. That is the first step to get acquainted with the overall plan and experience we have thought up for installing .NET Core bits. -# Debian daily feed - -Newest Runtime binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h. - -## Obtaining binaries - -Add debian feed: - -For ubuntu 14.04 : trusty , ubuntu 16.04:xenial -``` -sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - -sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - -sudo apt-get update -``` - -Install: -``` -sudo apt-get install = -``` - -To list available packages: -``` -apt-cache search dotnet-sharedframework | grep 2.0.0 -``` - ## Filing issues This repo should contain issues that are tied to the installation of the "muxer" (the `dotnet` binary) and installation of the .NET Core runtime and libraries. @@ -59,11 +32,11 @@ Daily Builds | Platform | Master
[![][build-badge-master]][build-master] | Release/1.1.X
[![][build-badge-1.X.X]][build-1.X.X] | Release/1.0.X
[![][build-badge-1.0.X]][build-1.0.X] | |---------|:----------:|:----------:|:----------:| -| **Windows (x64)** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master]
[zip][win-x64-zip-master]
[Symbols (zip)][win-x64-symbols-zip-master]
Portable Build
[Installer][win-x64-installer-master]
[zip][win-x64-zip-master]
[Symbols (zip)][win-x64-symbols-zip-master] | [![][win-x64-badge-1.1.X]][win-x64-version-1.1.X]
[Installer][win-x64-installer-1.1.X]
[zip][win-x64-zip-1.1.X] | [![][win-x64-badge-preview]][win-x64-version-preview]
[Installer][win-x64-installer-preview]
[zip][win-x64-zip-preview] | -| **Windows (x86)** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master]
[zip][win-x86-zip-master]
[Symbols (zip)][win-x86-symbols-zip-master]
Portable Build
[Installer][win-x86-installer-master]
[zip][win-x86-zip-master]
[Symbols (zip)][win-x86-symbols-zip-master] | [![][win-x86-badge-1.1.X]][win-x86-version-1.1.X]
[Installer][win-x86-installer-1.1.X]
[zip][win-x86-zip-1.1.X] | [![][win-x86-badge-preview]][win-x86-version-preview]
[Installer][win-x86-installer-preview]
[zip][win-x86-zip-preview] | -| **Windows (arm32)** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master]
[Symbols (zip)][win-arm-symbols-zip-master]
Portable Build
[zip][win-arm-zip-master]
[Symbols (zip)][win-arm-symbols-zip-master] | N/A | N/A | -| **Windows (arm64)** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master]
[Symbols (zip)][win-arm64-symbols-zip-master]
Portable Build
[zip][win-arm64-zip-master]
[Symbols (zip)][win-arm64-symbols-zip-master] | N/A | N/A | -| **Mac OS X (x64)** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master]
[tar.gz][osx-targz-master]
[Symbols (tar.gz)][osx-symbols-targz-master]
Portable Build
[Installer][osx-installer-master]
[tar.gz][osx-targz-master]
[Symbols (tar.gz)][osx-symbols-targz-master] | [![][osx-badge-1.1.X]][osx-version-1.1.X]
[Installer][osx-installer-1.1.X]
[tar.gz][osx-targz-1.1.X] | [![][osx-badge-preview]][osx-version-preview]
[Installer][osx-installer-preview]
[tar.gz][osx-targz-preview] | +| **Windows (x64)** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master]
[zip][win-x64-zip-master]
[Symbols (zip)][win-x64-symbols-zip-master] | [![][win-x64-badge-1.1.X]][win-x64-version-1.1.X]
[Installer][win-x64-installer-1.1.X]
[zip][win-x64-zip-1.1.X] | [![][win-x64-badge-preview]][win-x64-version-preview]
[Installer][win-x64-installer-preview]
[zip][win-x64-zip-preview] | +| **Windows (x86)** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master]
[zip][win-x86-zip-master]
[Symbols (zip)][win-x86-symbols-zip-master] | [![][win-x86-badge-1.1.X]][win-x86-version-1.1.X]
[Installer][win-x86-installer-1.1.X]
[zip][win-x86-zip-1.1.X] | [![][win-x86-badge-preview]][win-x86-version-preview]
[Installer][win-x86-installer-preview]
[zip][win-x86-zip-preview] | +| **Windows (arm32)** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master]
[Symbols (zip)][win-arm-symbols-zip-master] | N/A | N/A | +| **Windows (arm64)** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master]
[Symbols (zip)][win-arm64-symbols-zip-master] | N/A | N/A | +| **Mac OS X (x64)** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master]
[tar.gz][osx-targz-master]
[Symbols (tar.gz)][osx-symbols-targz-master] | [![][osx-badge-1.1.X]][osx-version-1.1.X]
[Installer][osx-installer-1.1.X]
[tar.gz][osx-targz-1.1.X] | [![][osx-badge-preview]][osx-version-preview]
[Installer][osx-installer-preview]
[tar.gz][osx-targz-preview] | | **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-master-portable]][linux-x64-version-master-portable]
[tar.gz][linux-x64-targz-master-portable]
[Symbols (tar.gz)][linux-x64-symbols-targz-master-portable] | N/A | N/A | | **Linux (arm)** (for glibc based OS) | [![][linux-arm-badge-master-portable]][linux-arm-version-master-portable]
[tar.gz][linux-arm-targz-master-portable]
[Symbols (tar.gz)][linux-arm-symbols-targz-master-portable] | N/A | N/A | | **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-master]][ubuntu-14.04-version-master]
[Host][ubuntu-14.04-host-master]
[Host FX Resolver][ubuntu-14.04-hostfxr-master]
[Shared Framework][ubuntu-14.04-sharedfx-master]
[tar.gz][ubuntu-14.04-targz-master]
[Symbols (tar.gz)][ubuntu-14.04-symbols-targz-master] | [![][ubuntu-14.04-badge-1.1.X]][ubuntu-14.04-version-1.1.X]
[Host][ubuntu-14.04-host-1.1.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-14.04-sharedfx-1.1.X]
[tar.gz][ubuntu-14.04-targz-1.1.X] | [![][ubuntu-14.04-badge-preview]][ubuntu-14.04-version-preview]
[Host][ubuntu-14.04-host-preview]
[Host FX Resolver][ubuntu-14.04-hostfxr-preview]
[Shared Framework][ubuntu-14.04-sharedfx-preview]
[tar.gz][ubuntu-14.04-targz-preview] | @@ -90,17 +63,11 @@ Daily Builds [build-1.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=4187&_a=completed -[win-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg -[win-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x64.version -[win-x64-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x64.latest.exe -[win-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x64.latest.zip -[win-x64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x64.latest.zip - -[win-x64-badge-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_x64_Release_version_badge.svg -[win-x64-version-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x64.portable.version -[win-x64-installer-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x64.latest-portable.exe -[win-x64-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x64.latest-portable.zip -[win-x64-symbols-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x64.latest-portable.zip +[win-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_x64_Release_version_badge.svg +[win-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x64.portable.version +[win-x64-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x64.latest-portable.exe +[win-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x64.latest-portable.zip +[win-x64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x64.latest-portable.zip [win-x64-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg [win-x64-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x64.version @@ -112,17 +79,11 @@ Daily Builds [win-x64-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x64.latest.exe [win-x64-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x64.latest.zip -[win-x86-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg -[win-x86-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x86.version -[win-x86-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x86.latest.exe -[win-x86-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x86.latest.zip -[win-x86-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x86.latest.zip - -[win-x86-badge-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_x86_Release_version_badge.svg -[win-x86-version-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x86.portable.version -[win-x86-installer-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x86.latest-portable.exe -[win-x86-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x86.latest-portable.zip -[win-x86-symbols-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x86.latest-portable.zip +[win-x86-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_x86_Release_version_badge.svg +[win-x86-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.x86.portable.version +[win-x86-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-win-x86.latest-portable.exe +[win-x86-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-x86.latest-portable.zip +[win-x86-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-x86.latest-portable.zip [win-x86-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg [win-x86-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x86.version @@ -134,37 +95,21 @@ Daily Builds [win-x86-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x86.latest.exe [win-x86-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x86.latest.zip -[win-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Windows_arm_Release_version_badge.svg -[win-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm.version -[win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm.latest.zip -[win-arm-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm.latest.zip +[win-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_arm_Release_version_badge.svg +[win-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm.portable.version +[win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm.latest-portable.zip +[win-arm-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm.latest-portable.zip -[win-arm-badge-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_arm_Release_version_badge.svg -[win-arm-version-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm.portable.version -[win-arm-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm.latest-portable.zip -[win-arm-symbols-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm.latest-portable.zip +[win-arm64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_arm64_Release_version_badge.svg +[win-arm64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm64.portable.version +[win-arm64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm64.latest-portable.zip +[win-arm64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm64.latest-portable.zip -[win-arm64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Windows_arm64_Release_version_badge.svg -[win-arm64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm64.version -[win-arm64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm64.latest.zip -[win-arm64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm64.latest.zip - -[win-arm64-badge-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_win_portable_arm64_Release_version_badge.svg -[win-arm64-version-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.win.arm64.portable.version -[win-arm64-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-win-arm64.latest-portable.zip -[win-arm64-symbols-zip-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-win-arm64.latest-portable.zip - -[osx-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg -[osx-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.osx.x64.version -[osx-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-osx-x64.latest.pkg -[osx-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-osx-x64.latest.tar.gz -[osx-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-osx-x64.latest.tar.gz - -[osx-badge-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_osx_portable_x64_Release_version_badge.svg -[osx-version-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.osx.x64.portable.version -[osx-installer-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-osx-x64.latest-portable.pkg -[osx-targz-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-osx-x64.latest-portable.tar.gz -[osx-symbols-targz-master-portable]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-osx-x64.latest-portable.tar.gz +[osx-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_osx_portable_x64_Release_version_badge.svg +[osx-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.osx.x64.portable.version +[osx-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-osx-x64.latest-portable.pkg +[osx-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-osx-x64.latest-portable.tar.gz +[osx-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-osx-x64.latest-portable.tar.gz [osx-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg [osx-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.osx.x64.version @@ -334,3 +279,30 @@ Daily Builds [opensuse-42.1-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_openSUSE_42_1_x64_Release_version_badge.svg [opensuse-42.1-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.opensuse.42.1.x64.version [opensuse-42.1-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-opensuse.42.1-x64.latest.tar.gz + +# Debian daily feed + +Newest Runtime binaries for 2.0.0 in debian feed may be delayed due to external issues by up to 24h. + +## Obtaining binaries + +Add debian feed: + +For ubuntu 14.04 : trusty , ubuntu 16.04:xenial +``` +sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' + +sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 + +sudo apt-get update +``` + +Install: +``` +sudo apt-get install = +``` + +To list available packages: +``` +apt-cache search dotnet-sharedframework | grep 2.0.0 +``` diff --git a/build_projects/dotnet-host-build/PublishTargets.cs b/build_projects/dotnet-host-build/PublishTargets.cs index 5b2fd0d8..d0a0da0c 100644 --- a/build_projects/dotnet-host-build/PublishTargets.cs +++ b/build_projects/dotnet-host-build/PublishTargets.cs @@ -125,10 +125,6 @@ namespace Microsoft.DotNet.Host.Build // Generate the Sharedfx Version text files List versionFiles = new List() { - "win.x86.version", - "win.x64.version", - "win.arm.version", - "win.arm64.version", "win.x86.portable.version", "win.x64.portable.version", "win.arm.portable.version", @@ -141,7 +137,6 @@ namespace Microsoft.DotNet.Host.Build "ubuntu.16.04.arm.version", "ubuntu.16.10.x64.version", "rhel.x64.version", - "osx.x64.version", "osx.x64.portable.version", "debian.8.armel.version", "debian.x64.version", @@ -207,10 +202,6 @@ namespace Microsoft.DotNet.Host.Build { Dictionary badges = new Dictionary() { - { "sharedfx_Windows_x86", false }, - { "sharedfx_Windows_x64", false }, - { "sharedfx_Windows_arm", false }, - { "sharedfx_Windows_arm64", false }, { "sharedfx_win_portable_x86", false }, { "sharedfx_win_portable_x64", false }, { "sharedfx_win_portable_arm", false }, @@ -223,7 +214,6 @@ namespace Microsoft.DotNet.Host.Build { "sharedfx_Ubuntu_16_04_arm", false }, { "sharedfx_Ubuntu_16_10_x64", false }, { "sharedfx_RHEL_x64", false }, - { "sharedfx_OSX_x64", false }, { "sharedfx_osx_portable_x64", false }, // { "sharedfx_Debian_8_armel", false }, { "sharedfx_Debian_x64", false }, diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index d973401c..975be01b 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -478,13 +478,13 @@ "value": "PassedViaPipeBuild" }, "SIGNED_PACKAGES": { - "value": "false" + "value": "true" }, "CertificateId": { "value": "400" }, "RID": { - "value": "win81-x64", + "value": "win-x64", "allowOverride": true }, "MsbuildSigningArguments": { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x86.json b/buildpipeline/Core-Setup-Signing-Windows-x86.json index ade23e6f..1d921b6d 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x86.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x86.json @@ -457,7 +457,7 @@ "value": "400" }, "RID": { - "value": "win81-x86", + "value": "win-x86", "allowOverride": true }, "PB_PortableBuild": { diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 76b06e17..9ee9f3af 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -95,14 +95,6 @@ "Platform": "x64" } }, - { - "Name": "Core-Setup-OSX-x64", - "ReportingParameters": { - "OperatingSystem": "OSX", - "Type": "build/product/", - "Platform": "x64" - } - }, { "Name": "Core-Setup-OSX-x64", "Parameters": { @@ -139,19 +131,7 @@ { "Name": "Core-Setup-Signing-Windows-x64", "Parameters": { - "SIGNED_PACKAGES": "true" - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "Type": "build/product/", - "Platform": "x64" - } - }, - { - "Name": "Core-Setup-Signing-Windows-x64", - "Parameters": { - "PB_PortableBuild": "-portable", - "RID": "win-x64" + "PB_PortableBuild": "-portable" }, "ReportingParameters": { "OperatingSystem": "Windows", @@ -160,19 +140,10 @@ "Platform": "x64" } }, - { - "Name": "Core-Setup-Signing-Windows-x86", - "ReportingParameters": { - "OperatingSystem": "Windows", - "Type": "build/product/", - "Platform": "x86" - } - }, { "Name": "Core-Setup-Signing-Windows-x86", "Parameters": { - "PB_PortableBuild": "-portable", - "RID": "win-x86" + "PB_PortableBuild": "-portable" }, "ReportingParameters": { "OperatingSystem": "Windows", @@ -219,14 +190,6 @@ "Type": "build/product/" } }, - { - "Name": "Core-Setup-Windows-arm32", - "ReportingParameters": { - "OperatingSystem": "Windows", - "Type": "build/product/", - "Platform": "arm" - } - }, { "Name": "Core-Setup-Windows-arm32", "Parameters": { @@ -250,14 +213,6 @@ "Type": "build/product/", "Platform": "arm64" } - }, - { - "Name": "Core-Setup-Windows-arm64", - "ReportingParameters": { - "OperatingSystem": "Windows", - "Type": "build/product/", - "Platform": "arm64" - } } ] } diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index dbb75157..096df9b2 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -20,22 +20,11 @@ armel - - - x86 - x86 - - - arm - - - arm64 - arm From 9edd9c71c0387477019aa3f28b6ed963f0b9c286 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 21 Apr 2017 17:48:45 -0500 Subject: [PATCH 013/198] Disable non-portable linux builds. --- README.md | 35 +- .../dotnet-host-build/PublishTargets.cs | 12 - buildpipeline/Core-Setup-RHEL7-x64.json | 306 ------------------ buildpipeline/pipeline.json | 55 ---- pkg/projects/netcoreappRIDs.props | 6 - 5 files changed, 3 insertions(+), 411 deletions(-) delete mode 100644 buildpipeline/Core-Setup-RHEL7-x64.json diff --git a/README.md b/README.md index df216be6..268b3163 100644 --- a/README.md +++ b/README.md @@ -40,16 +40,14 @@ Daily Builds | **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-master-portable]][linux-x64-version-master-portable]
[tar.gz][linux-x64-targz-master-portable]
[Symbols (tar.gz)][linux-x64-symbols-targz-master-portable] | N/A | N/A | | **Linux (arm)** (for glibc based OS) | [![][linux-arm-badge-master-portable]][linux-arm-version-master-portable]
[tar.gz][linux-arm-targz-master-portable]
[Symbols (tar.gz)][linux-arm-symbols-targz-master-portable] | N/A | N/A | | **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-master]][ubuntu-14.04-version-master]
[Host][ubuntu-14.04-host-master]
[Host FX Resolver][ubuntu-14.04-hostfxr-master]
[Shared Framework][ubuntu-14.04-sharedfx-master]
[tar.gz][ubuntu-14.04-targz-master]
[Symbols (tar.gz)][ubuntu-14.04-symbols-targz-master] | [![][ubuntu-14.04-badge-1.1.X]][ubuntu-14.04-version-1.1.X]
[Host][ubuntu-14.04-host-1.1.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-14.04-sharedfx-1.1.X]
[tar.gz][ubuntu-14.04-targz-1.1.X] | [![][ubuntu-14.04-badge-preview]][ubuntu-14.04-version-preview]
[Host][ubuntu-14.04-host-preview]
[Host FX Resolver][ubuntu-14.04-hostfxr-preview]
[Shared Framework][ubuntu-14.04-sharedfx-preview]
[tar.gz][ubuntu-14.04-targz-preview] | -| **Ubuntu 14.04 (arm32)** | [![][ubuntu-14.04-arm-badge-master]][ubuntu-14.04-arm-version-master]
[tar.gz][ubuntu-14.04-arm-targz-master]
[Symbols (tar.gz)][ubuntu-14.04-arm-symbols-targz-master] | N/A | N/A | | **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-master]][ubuntu-16.04-version-master]
[Host][ubuntu-16.04-host-master]
[Host FX Resolver][ubuntu-16.04-hostfxr-master]
[Shared Framework][ubuntu-16.04-sharedfx-master]
[tar.gz][ubuntu-16.04-targz-master]
[Symbols (tar.gz)][ubuntu-16.04-symbols-targz-master] | [![][ubuntu-16.04-badge-1.1.X]][ubuntu-16.04-version-1.1.X]
[Host][ubuntu-16.04-host-1.1.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.04-sharedfx-1.1.X]
[tar.gz][ubuntu-16.04-targz-1.1.X] | [![][ubuntu-16.04-badge-preview]][ubuntu-16.04-version-preview]
[Host][ubuntu-16.04-host-preview]
[Host FX Resolver][ubuntu-16.04-hostfxr-preview]
[Shared Framework][ubuntu-16.04-sharedfx-preview]
[tar.gz][ubuntu-16.04-targz-preview] | -| **Ubuntu 16.04 (arm32)** | [![][ubuntu-16.04-arm-badge-master]][ubuntu-16.04-arm-version-master]
[tar.gz][ubuntu-16.04-arm-targz-master]
[Symbols (tar.gz)][ubuntu-16.04-arm-symbols-targz-master] | N/A | N/A | | **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-master]][ubuntu-16.10-version-master]
[Host][ubuntu-16.10-host-master]
[Host FX Resolver][ubuntu-16.10-hostfxr-master]
[Shared Framework][ubuntu-16.10-sharedfx-master]
[tar.gz][ubuntu-16.10-targz-master]
[Symbols (tar.gz)][ubuntu-16.10-symbols-targz-master] | [![][ubuntu-16.10-badge-1.1.X]][ubuntu-16.10-version-1.1.X]
[Host][ubuntu-16.10-host-1.1.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.10-sharedfx-1.1.X]
[tar.gz][ubuntu-16.10-targz-1.1.X] | N/A | | **Debian 8.2 (x64)** | [![][debian-8.2-badge-master]][debian-8.2-version-master]
[Host][debian-8.2-host-master]
[Host FX Resolver][debian-8.2-hostfxr-master]
[Shared Framework][debian-8.2-sharedfx-master]
[tar.gz][debian-8.2-targz-master]
[Symbols (tar.gz)][debian-8.2-symbols-targz-master] | [![][debian-8.2-badge-1.1.X]][debian-8.2-version-1.1.X]
[Host][debian-8.2-host-1.1.X]
[Host FX Resolver][debian-8.2-hostfxr-1.1.X]
[Shared Framework][debian-8.2-sharedfx-1.1.X]
[tar.gz][debian-8.2-targz-1.1.X] | [![][debian-8.2-badge-preview]][debian-8.2-version-preview]
[Host][debian-8.2-host-preview]
[Host FX Resolver][debian-8.2-hostfxr-preview]
[Shared Framework][debian-8.2-sharedfx-preview]
[tar.gz][debian-8.2-targz-preview] | | **CentOS 7.1 (x64)** | N/A | [![][centos-badge-1.1.X]][centos-version-1.1.X]
[tar.gz][centos-targz-1.1.X] | [![][centos-badge-preview]][centos-version-preview]
[tar.gz][centos-targz-preview] | -| **RHEL 7.2 (x64)** | [![][rhel-badge-master]][rhel-version-master]
[tar.gz][rhel-targz-master]
[Symbols (tar.gz)][rhel-symbols-targz-master] | [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] | +| **RHEL 7.2 (x64)** | N/A | [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] | | **Fedora 23 (x64)** | N/A | [![][fedora-23-badge-1.1.X]][fedora-23-version-1.1.X]
[tar.gz][fedora-23-targz-1.1.X] | [![][fedora-23-badge-preview]][fedora-23-version-preview]
[tar.gz][fedora-23-targz-preview] | -| **Fedora 24 (x64)** | [![][fedora-24-badge-master]][fedora-24-version-master]
[tar.gz][fedora-24-targz-master]
[Symbols (tar.gz)][fedora-24-symbols-targz-master] | [![][fedora-24-badge-1.1.X]][fedora-24-version-1.1.X]
[tar.gz][fedora-24-targz-1.1.X] | N/A | -| **OpenSUSE 42.1 (x64)** | [![][opensuse-42.1-badge-master]][opensuse-42.1-version-master]
[tar.gz][opensuse-42.1-targz-master]
[Symbols (tar.gz)][opensuse-42.1-symbols-targz-master] | [![][opensuse-42.1-badge-1.1.X]][opensuse-42.1-version-1.1.X]
[tar.gz][opensuse-42.1-targz-1.1.X] | N/A | +| **Fedora 24 (x64)** | N/A | [![][fedora-24-badge-1.1.X]][fedora-24-version-1.1.X]
[tar.gz][fedora-24-targz-1.1.X] | N/A | +| **OpenSUSE 42.1 (x64)** | N/A | [![][opensuse-42.1-badge-1.1.X]][opensuse-42.1-version-1.1.X]
[tar.gz][opensuse-42.1-targz-1.1.X] | N/A | *Note: Our .deb packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented above.* @@ -155,12 +153,6 @@ Daily Builds [ubuntu-14.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz -[ubuntu-14.04-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Ubuntu_arm_Release_version_badge.svg -[ubuntu-14.04-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.ubuntu.arm.version -[ubuntu-14.04-arm-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-ubuntu-arm.latest.tar.gz -[ubuntu-14.04-arm-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-ubuntu-arm.latest.tar.gz - - [ubuntu-16.04-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Ubuntu_16_04_x64_Release_version_badge.svg [ubuntu-16.04-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.ubuntu.16.04.x64.version [ubuntu-16.04-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb @@ -184,12 +176,6 @@ Daily Builds [ubuntu-16.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz -[ubuntu-16.04-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Ubuntu_16_04_arm_Release_version_badge.svg -[ubuntu-16.04-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.ubuntu.16.04.arm.version -[ubuntu-16.04-arm-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-ubuntu.16.04-arm.latest.tar.gz -[ubuntu-16.04-arm-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-ubuntu.16.04-arm.latest.tar.gz - - [ubuntu-16.10-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Ubuntu_16_10_x64_Release_version_badge.svg [ubuntu-16.10-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.ubuntu.16.10.x64.version [ubuntu-16.10-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Installers/Latest/dotnet-host-ubuntu.16.10-x64.latest.deb @@ -238,11 +224,6 @@ Daily Builds [centos-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz -[rhel-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg -[rhel-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.rhel.x64.version -[rhel-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz -[rhel-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-rhel-x64.latest.tar.gz - [rhel-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg [rhel-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.rhel.x64.version [rhel-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz @@ -261,21 +242,11 @@ Daily Builds [fedora-23-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz -[fedora-24-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_Fedora_24_x64_Release_version_badge.svg -[fedora-24-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.fedora.24.x64.version -[fedora-24-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-fedora.24-x64.latest.tar.gz -[fedora-24-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-fedora.24-x64.latest.tar.gz - [fedora-24-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Fedora_24_x64_Release_version_badge.svg [fedora-24-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.fedora.24.x64.version [fedora-24-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-fedora.24-x64.latest.tar.gz -[opensuse-42.1-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/sharedfx_openSUSE_42_1_x64_Release_version_badge.svg -[opensuse-42.1-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/dnvm/latest.sharedfx.opensuse.42.1.x64.version -[opensuse-42.1-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-opensuse.42.1-x64.latest.tar.gz -[opensuse-42.1-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/master/Binaries/Latest/dotnet-sharedframework-symbols-opensuse.42.1-x64.latest.tar.gz - [opensuse-42.1-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_openSUSE_42_1_x64_Release_version_badge.svg [opensuse-42.1-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.opensuse.42.1.x64.version [opensuse-42.1-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-opensuse.42.1-x64.latest.tar.gz diff --git a/build_projects/dotnet-host-build/PublishTargets.cs b/build_projects/dotnet-host-build/PublishTargets.cs index d0a0da0c..dc14ce7f 100644 --- a/build_projects/dotnet-host-build/PublishTargets.cs +++ b/build_projects/dotnet-host-build/PublishTargets.cs @@ -132,16 +132,10 @@ namespace Microsoft.DotNet.Host.Build "linux.x64.portable.version", "ubuntu.x64.version", "linux.arm.portable.version", - "ubuntu.arm.version", "ubuntu.16.04.x64.version", - "ubuntu.16.04.arm.version", "ubuntu.16.10.x64.version", - "rhel.x64.version", "osx.x64.portable.version", - "debian.8.armel.version", "debian.x64.version", - "fedora.24.x64.version", - "opensuse.42.1.x64.version" }; PublishCoreHostPackagesToFeed(); @@ -208,17 +202,11 @@ namespace Microsoft.DotNet.Host.Build { "sharedfx_win_portable_arm64", false }, { "sharedfx_linux_portable_x64", false }, { "sharedfx_Ubuntu_x64", false }, - { "sharedfx_Ubuntu_arm", false }, { "sharedfx_linux_portable_arm", false }, { "sharedfx_Ubuntu_16_04_x64", false }, - { "sharedfx_Ubuntu_16_04_arm", false }, { "sharedfx_Ubuntu_16_10_x64", false }, - { "sharedfx_RHEL_x64", false }, { "sharedfx_osx_portable_x64", false }, - // { "sharedfx_Debian_8_armel", false }, { "sharedfx_Debian_x64", false }, - { "sharedfx_Fedora_24_x64", false }, - { "sharedfx_openSUSE_42_1_x64", false } }; List blobs = new List(AzurePublisherTool.ListBlobs($"{Channel}/Binaries/{SharedFrameworkNugetVersion}/")); diff --git a/buildpipeline/Core-Setup-RHEL7-x64.json b/buildpipeline/Core-Setup-RHEL7-x64.json deleted file mode 100644 index 4fc44bae..00000000 --- a/buildpipeline/Core-Setup-RHEL7-x64.json +++ /dev/null @@ -1,306 +0,0 @@ -{ - "build": [ - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "git checkout", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "git", - "arguments": "checkout $(SourceVersion)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Create host machine tools sandbox", - "timeoutInMinutes": 0, - "task": { - "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", - "versionSpec": "2.*", - "definitionType": "task" - }, - "inputs": { - "SourceFolder": "pkg", - "Contents": "**", - "TargetFolder": "$(DockerHost_Sandbox)", - "CleanTargetFolder": "false", - "OverWrite": "false", - "flattenFolders": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Initialize tools for host machine", - "timeoutInMinutes": 0, - "task": { - "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", - "versionSpec": "2.*", - "definitionType": "task" - }, - "inputs": { - "scriptPath": "$(DockerHost_Sandbox)/init-tools.sh", - "args": "", - "disableAutoCwd": "false", - "cwd": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Initialize Docker", - "timeoutInMinutes": 0, - "task": { - "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", - "versionSpec": "2.*", - "definitionType": "task" - }, - "inputs": { - "scriptPath": "$(DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh", - "args": "$(DockerImageName)", - "disableAutoCwd": "false", - "cwd": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run build in Docker container", - "timeoutInMinutes": 0, - "task": { - "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", - "versionSpec": "2.*", - "definitionType": "task" - }, - "inputs": { - "scriptPath": "scripts/dockerrun-as-current-user.sh", - "args": "-t --rm --sig-proxy=true --name $(DockerContainerName) -v $(Build.SourcesDirectory):/opt/code -w /opt/code -e CONNECTION_STRING -e PUBLISH_TO_AZURE_BLOB $(DockerImageName) /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh $(BuildArguments)\"", - "disableAutoCwd": "false", - "cwd": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Cleanup Docker", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "perl", - "arguments": "$(DockerHost_ToolsDirectory)/scripts/docker/cleanup-docker.sh", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Copy Publish Artifact: Build Logs", - "timeoutInMinutes": 0, - "task": { - "id": "1d341bb0-2106-458c-8422-d00bcea6512a", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "CopyRoot": "", - "Contents": "**/*.log", - "ArtifactName": "Build Logs", - "ArtifactType": "Container", - "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" - } - }, - { - "enabled": true, - "continueOnError": true, - "alwaysRun": true, - "displayName": "Cleanup VSTS Agent", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(DockerHost_ToolsDirectory)/msbuild.sh", - "arguments": "cleanupagent.proj /p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", - "workingFolder": "$(DockerHost_ToolsDirectory)/scripts/vstsagent/", - "failOnStandardError": "false" - } - } - ], - "options": [ - { - "enabled": false, - "definition": { - "id": "5bc3cfb7-6b54-4a4b-b5d2-a3905949f8a6" - }, - "inputs": { - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "7c555368-ca64-4199-add6-9ebaf0b0137d" - }, - "inputs": { - "multipliers": "[]", - "parallel": "false", - "continueOnError": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "a9db38f9-9fdc-478c-b0f9-464221e58316" - }, - "inputs": { - "workItemType": "4777", - "assignToRequestor": "true", - "additionalFields": "{}" - } - }, - { - "enabled": false, - "definition": { - "id": "57578776-4c22-4526-aeb0-86b6da17ee9c" - }, - "inputs": { - "additionalFields": "{}" - } - } - ], - "variables": { - "BuildConfiguration": { - "value": "Release", - "allowOverride": true - }, - "BuildArguments": { - "value": "--skip-prereqs --configuration $(BuildConfiguration) --targets Default", - "allowOverride": true - }, - "DockerImageName": { - "value": "microsoft/dotnet-buildtools-prereqs:rhel7_prereqs_2" - }, - "DockerContainerName": { - "value": "core-setup-rhel-$(Build.BuildId)", - "allowOverride": true - }, - "CONNECTION_STRING": { - "value": "PassedViaPipeBuild" - }, - "PUBLISH_TO_AZURE_BLOB": { - "value": "true", - "allowOverride": true - }, - "NUGET_FEED_URL": { - "value": "https://dotnet.myget.org/F/dotnet-core/api/v2/package" - }, - "NUGET_API_KEY": { - "value": "PassedViaPipeBuild" - }, - "GITHUB_PASSWORD": { - "value": "PassedViaPipeBuild" - }, - "PB_CleanAgent": { - "value": "true" - }, - "DockerHost_Sandbox": { - "value": "$(Build.StagingDirectory)/HostSandbox" - }, - "DockerHost_ToolsDirectory": { - "value": "$(DockerHost_Sandbox)/Tools" - }, - "NUGET_SYMBOLS_FEED_URL": { - "value": "https://dotnet.myget.org/F/dotnet-core/symbols/api/v2/package" - } - }, - "demands": [ - "Agent.OS -equals linux" - ], - "retentionRules": [ - { - "branches": [ - "+refs/heads/*" - ], - "artifacts": [], - "artifactTypesToDelete": [ - "FilePath", - "SymbolStore" - ], - "daysToKeep": 2, - "minimumToKeep": 1, - "deleteBuildRecord": true, - "deleteTestResults": true - } - ], - "buildNumberFormat": "$(Date:yyyMMdd)$(Rev:.r)", - "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 90, - "badgeEnabled": true, - "repository": { - "properties": { - "connectedServiceId": "f4c31735-42d2-4c3a-bc47-7ac06fd0dccc", - "apiUrl": "https://api.github.com/repos/dotnet/core-setup", - "branchesUrl": "https://api.github.com/repos/dotnet/core-setup/branches", - "cloneUrl": "https://github.com/dotnet/core-setup.git", - "refsUrl": "https://api.github.com/repos/dotnet/core-setup/git/refs", - "gitLfsSupport": "false", - "skipSyncSource": "false", - "fetchDepth": "0", - "cleanOptions": "0" - }, - "id": "https://github.com/dotnet/core-setup.git", - "type": "GitHub", - "name": "dotnet/core-setup", - "url": "https://github.com/dotnet/core-setup.git", - "defaultBranch": "master", - "clean": "true", - "checkoutSubmodules": false - }, - "quality": "definition", - "queue": { - "pool": { - "id": 39, - "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" - }, - "path": "\\", - "type": "build", - "id": 3545, - "name": "Core-Setup-RHEL7-x64", - "project": { - "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "name": "DevDiv", - "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", - "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", - "state": "wellFormed", - "revision": 418097620 - } -} \ No newline at end of file diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 9ee9f3af..a7bce991 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -29,28 +29,6 @@ "Platform": "x64" } }, - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "fedora.24" - }, - "ReportingParameters": { - "OperatingSystem": "Fedora 24", - "Type": "build/product/", - "Platform": "x64" - } - }, - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "opensuse.42.1" - }, - "ReportingParameters": { - "OperatingSystem": "OpenSuse 42.1", - "Type": "build/product/", - "Platform": "x64" - } - }, { "Name": "Core-Setup-Linux", "Parameters": { @@ -119,15 +97,6 @@ "Platform": "x64" } }, - { - "Name": "Core-Setup-RHEL7-x64", - "ReportingParameters": { - "SubType": "Native", - "OperatingSystem": "RedHat 7", - "Type": "build/product/", - "Platform": "x64" - } - }, { "Name": "Core-Setup-Signing-Windows-x64", "Parameters": { @@ -152,18 +121,6 @@ "Platform": "x86" } }, - { - "Name": "Core-Setup-CrossBuild", - "Parameters": { - "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239", - "PB_Architecture": "arm", - "TargetRid": "ubuntu.14.04-arm" - }, - "ReportingParameters": { - "OperatingSystem": "Ubuntu 14.04", - "Type": "build/product/" - } - }, { "Name": "Core-Setup-CrossBuild", "Parameters": { @@ -178,18 +135,6 @@ "Type": "build/product/" } }, - { - "Name": "Core-Setup-CrossBuild", - "Parameters": { - "PB_DockerTag": "ubuntu-16.04-cross-ef0ac75-20175511035548", - "PB_Architecture": "arm", - "TargetRid": "ubuntu.16.04-arm" - }, - "ReportingParameters": { - "OperatingSystem": "Ubuntu 16.04", - "Type": "build/product/" - } - }, { "Name": "Core-Setup-Windows-arm32", "Parameters": { diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index 096df9b2..75b4f321 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -31,15 +31,9 @@ arm64 - - arm - arm - - arm - armel From 15d0ad0021ff2b5f8c31c59e5a5db1419214a1ad Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 24 Apr 2017 11:58:47 -0500 Subject: [PATCH 014/198] Only publish identity packages from a single build leg (windows x64). Also, fail publishing if an existing blob exists - no more overwriting azure storage blobs. We need to ensure each leg publishes distinct packages so we don't get into race conditions in publishing. --- .../dotnet-host-build/PublishTargets.cs | 21 +++++++++++++++---- .../Publishing/AzurePublisher.cs | 6 +++++- .../Utils/EnvVars.cs | 2 +- .../Core-Setup-Signing-Windows-x64.json | 5 ++++- .../Microsoft.NETCore.App.pkgproj | 2 +- ...t.NETCore.UniversalWindowsPlatform.pkgproj | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/build_projects/dotnet-host-build/PublishTargets.cs b/build_projects/dotnet-host-build/PublishTargets.cs index dc14ce7f..908a092f 100644 --- a/build_projects/dotnet-host-build/PublishTargets.cs +++ b/build_projects/dotnet-host-build/PublishTargets.cs @@ -309,21 +309,34 @@ namespace Microsoft.DotNet.Host.Build { foreach (var file in Directory.GetFiles(Dirs.CorehostLocalPackages, "*.nupkg")) { - var hostBlob = $"{Channel}/Binaries/{SharedFrameworkNugetVersion}/{Path.GetFileName(file)}"; - AzurePublisherTool.PublishFile(hostBlob, file); - Console.WriteLine($"Publishing package {hostBlob} to Azure."); + if (!IsRidAgnosticPackage(file) || EnvVars.PublishRidAgnosticPackages) + { + var hostBlob = $"{Channel}/Binaries/{SharedFrameworkNugetVersion}/{Path.GetFileName(file)}"; + AzurePublisherTool.PublishFile(hostBlob, file); + Console.WriteLine($"Publishing package {hostBlob} to Azure."); + } + else + { + Console.WriteLine($"Skipping publishing package {file} to Azure because it is RID-agnostic and EnvVars.PublishRidAgnosticPackages is not set to true."); + } } return c.Success(); } + private static bool IsRidAgnosticPackage(string packagePath) + { + var fileName = Path.GetFileName(packagePath); + return !fileName.StartsWith("runtime.", StringComparison.OrdinalIgnoreCase); + } + [Target] public static BuildTargetResult PublishManagedPackages(BuildTargetContext c) { // When building on non windows platforms, we don't compile the full set of // tfms a package targets (to prevent the need of having mono and the reference // assemblies installed. So we shouldn't publish these packages. - if (EnvVars.Signed && CurrentPlatform.IsWindows) + if (EnvVars.PublishRidAgnosticPackages && CurrentPlatform.IsWindows) { foreach (var file in Directory.GetFiles(Dirs.Packages, "*.nupkg")) { diff --git a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs index 64b693ed..8de30ba9 100644 --- a/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs +++ b/build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs @@ -57,7 +57,11 @@ namespace Microsoft.DotNet.Cli.Build Console.WriteLine($"Publishing file '{file}' to '{blob}'"); CloudBlockBlob blockBlob = _blobContainer.GetBlockBlobReference(blob); - blockBlob.UploadFromFileAsync(file).Wait(); + blockBlob.UploadFromFileAsync( + file, + AccessCondition.GenerateIfNotExistsCondition(), + options: null, + operationContext: null).Wait(); SetBlobPropertiesBasedOnFileType(blockBlob); } diff --git a/build_projects/shared-build-targets-utils/Utils/EnvVars.cs b/build_projects/shared-build-targets-utils/Utils/EnvVars.cs index 58244648..1fd48c6d 100644 --- a/build_projects/shared-build-targets-utils/Utils/EnvVars.cs +++ b/build_projects/shared-build-targets-utils/Utils/EnvVars.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public static readonly bool Verbose = GetBool("DOTNET_BUILD_VERBOSE"); - public static readonly bool Signed = GetBool("SIGNED_PACKAGES"); + public static readonly bool PublishRidAgnosticPackages = GetBool("PUBLISH_RID_AGNOSTIC_PACKAGES"); private static bool GetBool(string name, bool defaultValue = false) { diff --git a/buildpipeline/Core-Setup-Signing-Windows-x64.json b/buildpipeline/Core-Setup-Signing-Windows-x64.json index 975be01b..0bf7454c 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-x64.json +++ b/buildpipeline/Core-Setup-Signing-Windows-x64.json @@ -477,7 +477,10 @@ "GITHUB_PASSWORD": { "value": "PassedViaPipeBuild" }, - "SIGNED_PACKAGES": { + "BUILD_FULL_PLATFORM_MANIFEST": { + "value": "true" + }, + "PUBLISH_RID_AGNOSTIC_PACKAGES": { "value": "true" }, "CertificateId": { diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index ada51989..c5713ab8 100644 --- a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -15,7 +15,7 @@ restore all of those dependencies and gather the prospective content of the RID-specific Core.App packages. This is needed so that we have a complete platform manifest in the shipping version of the Microsoft.NETCore.App (RID-agnostic/identity package). --> - true + true diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/Microsoft.NETCore.UniversalWindowsPlatform.pkgproj b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/Microsoft.NETCore.UniversalWindowsPlatform.pkgproj index fef8a5ae..232876bf 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/Microsoft.NETCore.UniversalWindowsPlatform.pkgproj +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/Microsoft.NETCore.UniversalWindowsPlatform.pkgproj @@ -14,7 +14,7 @@ restore all of those dependencies and gather the prospective content of the RID-specific Core.App packages. This is needed so that we have a complete platform manifest in the shipping version of the Microsoft.NETCore.UniversalWindowsPlatform (RID-agnostic/identity package). --> - true + true From 080b1dfc710fd36537210567172903fff040d8ba Mon Sep 17 00:00:00 2001 From: ramarag Date: Mon, 24 Apr 2017 22:21:48 -0700 Subject: [PATCH 015/198] Fixing portable linux and removing rhel and centos legs --- netci.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netci.groovy b/netci.groovy index 2d11ec93..884e8554 100644 --- a/netci.groovy +++ b/netci.groovy @@ -10,7 +10,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:arm:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'RHEL7.2:x64:Release', 'CentOS7.1:x64:Debug', 'Fedora24:x64:Debug', 'OpenSUSE42.1:x64:Debug'] +def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:arm:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Fedora24:x64:Debug', 'OpenSUSE42.1:x64:Debug'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -64,7 +64,7 @@ platformList.each { platform -> if (os == 'PortableLinux') { // Trigger a portable Linux build that runs on RHEL7.2 - buildCommand += " --portableLinux" + buildCommand += " -portable" osForGHTrigger = "PortableLinux" os = "RHEL7.2" } From 556b138323eaa0e0660901495a79f2069fe6ffeb Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Tue, 18 Apr 2017 12:09:03 -0700 Subject: [PATCH 016/198] Ensure Architecture is added to all probe locations --- src/corehost/cli/args.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/corehost/cli/args.cpp b/src/corehost/cli/args.cpp index 456902cb..681a2af3 100644 --- a/src/corehost/cli/args.cpp +++ b/src/corehost/cli/args.cpp @@ -22,11 +22,11 @@ arguments_t::arguments_t() : * Setup the shared store directories. * * o %DOTNET_SHARED_STORE% -- multiple delimited paths - * o $HOME/.dotnet/{x86|x64}/ or %USERPROFILE%\.dotnet\{x86|x64} - * o dotnet.exe relative shared store + * o $HOME/.dotnet/{x86|x64}/tfm or %USERPROFILE%\.dotnet\{x86|x64}\ + * o dotnet.exe relative shared store\\ * o Global location * Windows: C:\Program Files (x86) or - * Unix: directory of dotnet on the path. + * Unix: directory of dotnet on the path.\\ */ void setup_shared_store_paths(const hostpolicy_init_t& init, const pal::string_t& own_dir, arguments_t* args) { @@ -52,12 +52,14 @@ void setup_shared_store_paths(const hostpolicy_init_t& init, const pal::string_t { args->dotnet_shared_store = own_dir; append_path(&args->dotnet_shared_store, RUNTIME_STORE_DIRECTORY_NAME); + append_path(&args->dotnet_shared_store, get_arch()); append_path(&args->dotnet_shared_store, init.tfm.c_str()); } // Global shared store dir if (get_global_shared_store_dir(&args->global_shared_store)) { + append_path(&args->global_shared_store, get_arch()); append_path(&args->global_shared_store, init.tfm.c_str()); } } From 4f1f6bc3ac1d2c9528b4e99d2f2ae6103d511f09 Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Tue, 25 Apr 2017 15:55:00 -0700 Subject: [PATCH 017/198] Disable RIDs not built --- pkg/projects/netcoreappRIDs.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index 75b4f321..40f782b4 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -16,9 +16,10 @@ - + @@ -34,9 +35,10 @@ arm - + \ No newline at end of file From 7de18f9c7e07192cbd01864cfb5935a185ae7b6b Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 25 Apr 2017 18:18:50 -0700 Subject: [PATCH 018/198] Update CoreClr, CoreFx to preview1-25225-03, preview1-25226-01, respectively --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 6 +++--- .../project.json.template | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 4f62fe63..d2d8cd02 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25225-02"; - public static readonly string JitVersion = "2.0.0-preview1-25225-02"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25225-03"; + public static readonly string JitVersion = "2.0.0-preview1-25225-03"; } } diff --git a/pkg/deps/project.json b/pkg/deps/project.json index 70a36f72..0876906d 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index 842b979f..92812600 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25225-02\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25226-01\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index 040a1c7d..ac085fb5 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25225-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-02", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25226-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-03", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", "NETStandard.Library": "2.0.0-preview1-25225-02" }, "frameworks": { diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index a8eaa228..523d432b 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,9 +1,9 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25225-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-02", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25225-02", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25226-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-03", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", "NETStandard.Library": "2.0.0-preview1-25225-02", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", From 04ef737226017cb22548921ed060de666b1d53e9 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 25 Apr 2017 21:49:23 -0700 Subject: [PATCH 019/198] Update CoreClr to preview1-25226-01 (#2181) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/projects/Microsoft.NETCore.App/project.json.template | 2 +- .../project.json.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index d2d8cd02..2036ed2c 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25225-03"; - public static readonly string JitVersion = "2.0.0-preview1-25225-03"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25226-01"; + public static readonly string JitVersion = "2.0.0-preview1-25226-01"; } } diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index ac085fb5..1a47db7f 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25226-01", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-03", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", "Microsoft.DiaSymReader.Native": "1.4.1", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", "NETStandard.Library": "2.0.0-preview1-25225-02" diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 523d432b..2fe16b9a 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25226-01", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25225-03", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", "NETStandard.Library": "2.0.0-preview1-25225-02", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", From a9ea8845b41c21f1a46ea77c03c769babee4fe1a Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 26 Apr 2017 08:07:26 -0700 Subject: [PATCH 020/198] Update CoreFx, Standard to preview1-25226-02, preview1-25226-01, respectively (#2184) --- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 6 +++--- .../project.json.template | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/deps/project.json b/pkg/deps/project.json index 0876906d..c62f80ad 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index 92812600..70a76e98 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25226-01\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25226-02\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index 1a47db7f..dc6d7403 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25226-01", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25226-02", "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", - "NETStandard.Library": "2.0.0-preview1-25225-02" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02", + "NETStandard.Library": "2.0.0-preview1-25226-01" }, "frameworks": { "netcoreapp2.0": {} diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 2fe16b9a..0f90cc15 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25226-01", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25226-02", "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-01", - "NETStandard.Library": "2.0.0-preview1-25225-02", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02", + "NETStandard.Library": "2.0.0-preview1-25226-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", "System.ServiceModel.NetTcp": "4.4.0-beta-25205-01", From 119efe09da120f5190a1d2b0920c446c80319854 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 26 Apr 2017 09:03:51 -0700 Subject: [PATCH 021/198] Revert "Disable RIDs not built" This reverts commit 4f1f6bc3ac1d2c9528b4e99d2f2ae6103d511f09. --- pkg/projects/netcoreappRIDs.props | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index 40f782b4..75b4f321 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -16,10 +16,9 @@ - @@ -35,10 +34,9 @@ arm - \ No newline at end of file From 528270eba1684cb51c1b1c87625ac88262448480 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 26 Apr 2017 08:49:15 -0700 Subject: [PATCH 022/198] Exclude debian and tizen from platform manifest Debian and Tizen are not built by our build process, but we want to include entries for them in our runtime.json. This was interfering with another feature where we must include a list of all files that are in all runtime packages in a manifest. The manifest is used when building a shared-framework app to understand which files are part of the shared framework and should be considered for conflict resolution. If the application were to reference an old package which had one of these files we want to trim it from the application if it failed conflict resolution (was a lower version). We cannot gather this information from debian and tizen packages since we don't build them. For now we will opt them out of this feature. This is likely "good enough" for them since they won't have any unique files that previously shipped in RID-less packages and require conflict resolution. A alternative solution for debian and tizen would be for them to ship their own RID-less package with their own platform manifest. They could do so transparently by implicitly referencing their package for folks that wanted this. --- .../Microsoft.NETCore.App.pkgproj | 4 +++- pkg/projects/dir.props | 4 ++++ pkg/projects/netcoreappRIDs.props | 17 ++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index c5713ab8..25fae771 100644 --- a/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -65,7 +65,9 @@ diff --git a/pkg/projects/dir.props b/pkg/projects/dir.props index 4c1afbb4..8ab6c6b6 100644 --- a/pkg/projects/dir.props +++ b/pkg/projects/dir.props @@ -63,6 +63,10 @@ + + + true + $(Platform) diff --git a/pkg/projects/netcoreappRIDs.props b/pkg/projects/netcoreappRIDs.props index 75b4f321..9c7ffd58 100644 --- a/pkg/projects/netcoreappRIDs.props +++ b/pkg/projects/netcoreappRIDs.props @@ -16,9 +16,6 @@ - - armel - @@ -34,9 +31,15 @@ arm - + + + armel - - - + + + armel + + \ No newline at end of file From fa62d01e00eaec93f228548f2ee00cd81c148066 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Wed, 26 Apr 2017 17:39:11 -0700 Subject: [PATCH 023/198] Update Branding in Mac and Windows Runtime installers (#2179) * Update Branding in Mac and Windows Runtime installers * Incorporated feedback. --- branchinfo.txt | 3 ++- build_projects/dotnet-host-build/PrepareTargets.cs | 1 + .../shared-build-targets-utils/Utils/Monikers.cs | 14 +++++++++++--- packaging/windows/sharedframework/bundle.wxl | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/branchinfo.txt b/branchinfo.txt index e96c6231..eb45f6fa 100644 --- a/branchinfo.txt +++ b/branchinfo.txt @@ -7,5 +7,6 @@ PATCH_VERSION=0 STABILIZE_PACKAGE_VERSION=false LOCK_HOST_VERSION=false RELEASE_SUFFIX=preview1 +RELEASEBRANDING_SUFFIX=Preview 1 CHANNEL=release/2.0.0 -BRANCH_NAME=release/2.0.0 +BRANCH_NAME=release/2.0.0 \ No newline at end of file diff --git a/build_projects/dotnet-host-build/PrepareTargets.cs b/build_projects/dotnet-host-build/PrepareTargets.cs index 344fce5b..3d4e6d23 100644 --- a/build_projects/dotnet-host-build/PrepareTargets.cs +++ b/build_projects/dotnet-host-build/PrepareTargets.cs @@ -216,6 +216,7 @@ namespace Microsoft.DotNet.Host.Build c.BuildContext["HostVersion"] = hostVersion; c.BuildContext["CommitHash"] = commitHash; c.BuildContext["BranchName"] = branchInfo.Entries["BRANCH_NAME"]; + c.BuildContext["ReleaseBrandingSuffix"] = branchInfo.Entries["RELEASEBRANDING_SUFFIX"]; // Define the version string to be used based upon whether we are stabilizing the versions or not. if (!fStabilizePackageVersion) diff --git a/build_projects/shared-build-targets-utils/Utils/Monikers.cs b/build_projects/shared-build-targets-utils/Utils/Monikers.cs index a5a1d511..3c87c339 100644 --- a/build_projects/shared-build-targets-utils/Utils/Monikers.cs +++ b/build_projects/shared-build-targets-utils/Utils/Monikers.cs @@ -10,14 +10,22 @@ namespace Microsoft.DotNet.Cli.Build public class Monikers { public const string SharedFrameworkName = "Microsoft.NETCore.App"; - public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2"; + public const string RuntimeName = "Microsoft .NET Core"; private static string GetBrandName(BuildTargetContext c, string suffix) { var buildVersion = c.BuildContext.Get("BuildVersion"); - return String.Format("Microsoft .NET Core {0}.{1}.{2} - {3}", buildVersion.Major, - buildVersion.Minor, buildVersion.Patch, suffix); + string releaseBrandingSuffix = c.BuildContext.Get("ReleaseBrandingSuffix")?.Trim(); + string runtimeBaseBranding = $"{RuntimeName} {buildVersion.Major}.{buildVersion.Minor}.{buildVersion.Patch}"; + + string brandName = string.IsNullOrEmpty(releaseBrandingSuffix) ? + //RTM branding + $"{runtimeBaseBranding} {suffix}" + //Pre-Release branding + : $"{runtimeBaseBranding} {releaseBrandingSuffix} {suffix}"; + return brandName; } + public static string GetSharedFxBrandName(BuildTargetContext c) { return GetBrandName(c, "Runtime"); diff --git a/packaging/windows/sharedframework/bundle.wxl b/packaging/windows/sharedframework/bundle.wxl index c7ade785..243e8522 100644 --- a/packaging/windows/sharedframework/bundle.wxl +++ b/packaging/windows/sharedframework/bundle.wxl @@ -1,6 +1,6 @@ - [WixBundleName] Setup + [WixBundleName] Installer [BUNDLEMONIKER] You just need a shell, a text editor and 10 minutes of your time. From 5008b3b5764ddcceef30a8d104bcbefc3ca8100b Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 27 Apr 2017 08:42:08 -0700 Subject: [PATCH 024/198] Update CoreClr, CoreFx, Standard to preview1-25227-01, preview1-25227-04, preview1-25227-01, respectively (#2206) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 8 ++++---- .../project.json.template | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 2036ed2c..d5bf585c 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25226-01"; - public static readonly string JitVersion = "2.0.0-preview1-25226-01"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25227-01"; + public static readonly string JitVersion = "2.0.0-preview1-25227-01"; } } diff --git a/pkg/deps/project.json b/pkg/deps/project.json index c62f80ad..e5eff129 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index 70a76e98..245010ee 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25226-02\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25227-04\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index dc6d7403..c396665a 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25226-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25227-04", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-01", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02", - "NETStandard.Library": "2.0.0-preview1-25226-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", + "NETStandard.Library": "2.0.0-preview1-25227-01" }, "frameworks": { "netcoreapp2.0": {} diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 0f90cc15..7ae6069b 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25226-02", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25226-01", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25226-02", - "NETStandard.Library": "2.0.0-preview1-25226-01", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25227-04", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", + "NETStandard.Library": "2.0.0-preview1-25227-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", "System.ServiceModel.NetTcp": "4.4.0-beta-25205-01", From 67b4bb987ed701da89859c27127027c7bb73ae90 Mon Sep 17 00:00:00 2001 From: Peter Marcu Date: Thu, 27 Apr 2017 09:51:08 -0700 Subject: [PATCH 025/198] Updating dummy file to kick off build --- Documentation/dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dummy.txt b/Documentation/dummy.txt index 99bb40e9..eb98ae5b 100644 --- a/Documentation/dummy.txt +++ b/Documentation/dummy.txt @@ -1 +1 @@ -4/10/2017 09:03:50 AM +4/27/2017 09:50:50 AM From e01befc220e46313417e8ff226ab371930f94370 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 27 Apr 2017 11:58:40 -0500 Subject: [PATCH 026/198] Use manually-cloned repo for CrossBuild pkg dir This avoids interferences from changes in the master branch. --- buildpipeline/Core-Setup-CrossBuild.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpipeline/Core-Setup-CrossBuild.json b/buildpipeline/Core-Setup-CrossBuild.json index 84c624c7..6fc6901a 100644 --- a/buildpipeline/Core-Setup-CrossBuild.json +++ b/buildpipeline/Core-Setup-CrossBuild.json @@ -66,7 +66,7 @@ "definitionType": "task" }, "inputs": { - "SourceFolder": "pkg", + "SourceFolder": "$(PB_RepoName)/pkg", "Contents": "**", "TargetFolder": "$(DockerHost_Sandbox)", "CleanTargetFolder": "false", From a8cbf1f7e2ff5b0a1395b8592ac5e23d540fa9d0 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Wed, 26 Apr 2017 18:15:17 -0700 Subject: [PATCH 027/198] removing cwd for the lookup of shared fx and sdk --- .../design-docs/multilevel-sharedfx-lookup.md | 23 ++- .../Command.cs | 17 ++ src/corehost/cli/fxr/fx_muxer.cpp | 16 +- src/corehost/cli/fxr/hostfxr.cpp | 6 +- .../GivenThatICareAboutMultilevelSDKLookup.cs | 66 +++----- ...nThatICareAboutMultilevelSharedFxLookup.cs | 150 ++++++------------ 6 files changed, 100 insertions(+), 178 deletions(-) diff --git a/Documentation/design-docs/multilevel-sharedfx-lookup.md b/Documentation/design-docs/multilevel-sharedfx-lookup.md index 296f1a06..8def9d3c 100644 --- a/Documentation/design-docs/multilevel-sharedfx-lookup.md +++ b/Documentation/design-docs/multilevel-sharedfx-lookup.md @@ -80,7 +80,7 @@ At last, the coreclr is loaded into memory and called to run the application. ## Proposed changes -Almost every file search is done in relation to the executable directory. It would be better to be able to search for some files in other directories as well. Suggested folders are the current working directory, the user location and the global .NET location. The user and global folders may vary depending on the running operational system. They are defined as follows: +Almost every file search is done in relation to the executable directory. It would be better to be able to search for some files in other directories as well. Suggested folders are the the user location and the global .NET location. The user and global folders may vary depending on the running operational system. They are defined as follows: User location: @@ -102,17 +102,15 @@ It’s being proposed that, if the specified version is defined through the conf - For productions: - 1. In relation to the current working directory: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. - 2. In relation to the user location: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. - 3. In relation to the executable directory: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. - 4. In relation to the global location: search for the most appropriate version by rolling forward. If it cannot be found, then we were not able to locate any compatible version. + 1. In relation to the user location: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. + 2. In relation to the executable directory: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. + 3. In relation to the global location: search for the most appropriate version by rolling forward. If it cannot be found, then we were not able to locate any compatible version. - For pre-releases: - 1. In relation to the current working directory: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. - 2. In relation to the user location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. - 3. In relation to the executable directory: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. - 4. In relation to the global location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, then we were not able to locate any compatible version. + 1. In relation to the user location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. + 2. In relation to the executable directory: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. + 3. In relation to the global location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, then we were not able to locate any compatible version. In the case that the desired version is defined through an argument, the multi-level lookup will happen as well but it will only consider the exact specified version (it will not roll forward). @@ -134,7 +132,6 @@ By following similar logic, it will be possible to implement future changes in t The search would be conducted as follows: -1. In relation to the current working directory: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. -2. In relation to the user location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. -3. In relation to the executable directory: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. -4. In relation to the global location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, then we were not able to find any version folder and an error message must be returned. \ No newline at end of file +1. In relation to the user location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. +2. In relation to the executable directory: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. +3. In relation to the global location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, then we were not able to find any version folder and an error message must be returned. diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs index 132fc010..e557d5bb 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/Command.cs @@ -8,6 +8,7 @@ using System.IO; using System.Linq; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using Microsoft.DotNet.InternalAbstractions; namespace Microsoft.DotNet.Cli.Build.Framework { @@ -222,6 +223,22 @@ namespace Microsoft.DotNet.Cli.Build.Framework return this; } + public Command WithUserProfile(string userprofile) + { + string _userDir; + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + _userDir = "USERPROFILE"; + } + else + { + _userDir = "HOME"; + } + + _process.StartInfo.Environment[_userDir] = userprofile; + return this; + } + public Command EnvironmentVariable(string name, string value) { _process.StartInfo.Environment[name] = value; diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index ee393515..bf4b91e8 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -432,24 +432,18 @@ pal::string_t fx_muxer_t::resolve_fx_dir(host_mode_t mode, // Multi-level SharedFX lookup will look for the most appropriate version in several locations // by following the priority rank below (from 1 to 4): - // 1. Current working directory - // 2. User directory - // 3. .exe directory - // 4. Global .NET directory + // User directory + // .exe directory + // Global .NET directory // If it is not activated, then only .exe directory will be considered std::vector hive_dir; - pal::string_t cwd; pal::string_t local_dir; pal::string_t global_dir; bool multilevel_lookup = multilevel_lookup_enabled(); if (multilevel_lookup) { - if (pal::getcwd(&cwd)) - { - hive_dir.push_back(cwd); - } if (pal::get_local_dotnet_dir(&local_dir)) { hive_dir.push_back(local_dir); @@ -643,10 +637,6 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal if (multilevel_lookup) { - if (!cwd.empty()) - { - hive_dir.push_back(cwd); - } if (pal::get_local_dotnet_dir(&local_dir)) { hive_dir.push_back(local_dir); diff --git a/src/corehost/cli/fxr/hostfxr.cpp b/src/corehost/cli/fxr/hostfxr.cpp index 73f8a85c..8eb7c4d0 100644 --- a/src/corehost/cli/fxr/hostfxr.cpp +++ b/src/corehost/cli/fxr/hostfxr.cpp @@ -118,11 +118,7 @@ SHARED_API int hostfxr_main(const int argc, const pal::char_t* argv[]) // working_dir // The directory where the search for global.json (which can // control the resolved SDK version) starts and proceeds -// upwards. This directory may also be searched for SDKs if -// multi-level lookup has not been disabled by the user's -// environment. This mimics the current working directory's -// interpretation when the dotnet exectuable resolves the SDK -// for CLI commands. +// upwards. // // buffer // The buffer where the resolved SDK path will be written. diff --git a/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 9a340413..eca0520a 100644 --- a/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -36,18 +36,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup string baseMultilevelDir = Path.Combine(artifactsDir, "dotnetMultilevelSDKLookup"); string multilevelDir = CalculateMultilevelDirectory(baseMultilevelDir); - // The three tested locations will be the cwd, the user folder and the exe dir. Both cwd and exe dir - // are easily overwritten, so they will be placed inside the multilevel folder. The actual user location will - // be used during tests. + // The three tested locations will be the cwd, the user folder and the exe dir. cwd is no longer supported. + // Both exe and user dir will be placed inside the multilevel folder + _currentWorkingDir = Path.Combine(multilevelDir, "cwd"); - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - _userDir = Environment.GetEnvironmentVariable("USERPROFILE"); - } - else - { - _userDir = Environment.GetEnvironmentVariable("HOME"); - } + _userDir = Path.Combine(multilevelDir, "user"); _executableDir = Path.Combine(multilevelDir, "exe"); // It's necessary to copy the entire publish folder to the exe dir because @@ -71,12 +64,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .BuildProject(); var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture; - // Set a dummy framework version (9999.0.0) in the cwd sharedFx location. We will - // always pick the framework from cwd to avoid interference with the sharedFxLookup - // test folders in the user dir - string cwdDummyFxVersion = Path.Combine(_currentWorkingDir, "shared", "Microsoft.NETCore.App", "9999.0.0"); + // Set a dummy framework version (9999.0.0) in the exe sharedFx location. We will + // always pick the framework from this to avoid interference with the sharedFxLookup + string exeDirDummyFxVersion = Path.Combine(_executableDir, "shared", "Microsoft.NETCore.App", "9999.0.0"); string builtSharedFxDir = fixture.BuiltDotnet.GreatestVersionSharedFxPath; - CopyDirectory(builtSharedFxDir, cwdDummyFxVersion); + CopyDirectory(builtSharedFxDir, exeDirDummyFxVersion); // The actual SDK version can be obtained from the built fixture. We'll use it to // locate the sdkDir from which we can get the files contained in the version folder @@ -107,12 +99,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-dummy"); // Specified CLI version: none - // CWD: empty // User: empty // Exe: 9999.0.0 // Expected: 9999.0.0 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -132,6 +124,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 9999.0.0 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -145,12 +138,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0-dummy"); // Specified CLI version: none - // CWD: 9999.0.0 + // CWD: 9999.0.0 --> should not be picked // User: 9999.0.0 // Exe: 9999.0.0 - // Expected: 9999.0.0 from cwd + // Expected: 9999.0.0 from User dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -158,7 +152,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(_cwdSelectedMessage); + .HaveStdErrContaining(_userSelectedMessage); // Remove dummy folders from user dir DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-dummy"); @@ -186,6 +180,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 9999.0.0 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -200,12 +195,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-global-dummy"); // Specified CLI version: 9999.0.0-global-dummy - // CWD: 9999.0.0 + // CWD: 9999.0.0 --> should not be picked // User: 9999.0.0, 9999.0.0-dummy // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy - // Expected: 9999.0.0 from cwd + // Expected: 9999.0.0 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -213,26 +209,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "9999.0.0", _dotnetSdkDllMessageTerminator)); - - // Add a prerelease dummy version in the cwd - AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0-global-dummy"); - - // Specified CLI version: 9999.0.0-global-dummy - // CWD: 9999.0.0, 9999.0.0-global-dummy - // User: 9999.0.0, 9999.0.0-dummy - // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy - // Expected: 9999.0.0-global-dummy from cwd - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0", _dotnetSdkDllMessageTerminator)); // Remove dummy folders from user dir DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0", "9999.0.0-dummy"); @@ -256,6 +233,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 9999.0.0 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -275,6 +253,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 9999.0.1 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -294,6 +273,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 9999.0.1 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -313,6 +293,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 10000.0.0-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -332,6 +313,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Expected: 10000.0.0 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() diff --git a/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs b/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs index acbf105a..4d45929d 100644 --- a/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs +++ b/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs @@ -39,14 +39,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // are easily overwritten, so they will be placed inside the multilevel folder. The actual user location will // be used during tests _currentWorkingDir = Path.Combine(multilevelDir, "cwd"); - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - _userDir = Environment.GetEnvironmentVariable("USERPROFILE"); - } - else - { - _userDir = Environment.GetEnvironmentVariable("HOME"); - } + _userDir = Path.Combine(multilevelDir, "user"); _executableDir = Path.Combine(multilevelDir, "exe"); // SharedFxBaseDirs contain all available version folders @@ -98,13 +91,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); // Version: 9999.0.0 - // CWD: empty // User: empty // Exe: 9999.0.0 // Expected: 9999.0.0 from exe dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -117,13 +110,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0"); // Version: 9999.0.0 - // CWD: empty // User: 9999.0.0 // Exe: 9999.0.0 // Expected: 9999.0.0 from user dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -136,20 +129,21 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.0.0"); // Version: 9999.0.0 - // CWD: 9999.0.0 + // CWD: 9999.0.0 --> should not be picked // User: 9999.0.0 // Exe: 9999.0.0 - // Expected: 9999.0.0 from cwd + // Expected: 9999.0.0 from user dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() .Should() .Pass() .And - .HaveStdErrContaining(_cwdSelectedMessage); + .HaveStdErrContaining(_userSelectedMessage); // Remove dummy folders from user dir DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0"); @@ -173,13 +167,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0-dummy0"); // Version: 9999.0.0-dummy0 - // CWD: empty // User: 9999.0.2, 9999.0.0-dummy2 // Exe: 9999.0.0, 9999.0.0-dummy0 // Expected: 9999.0.0-dummy2 from user dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -188,24 +182,24 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .And .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-dummy2")); - // Add a prerelease dummy version in CWD - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.0.0-dummy1"); + // Add a prerelease dummy version in userdir + AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0-dummy1"); // Version: 9999.0.0-dummy0 - // CWD: 9999.0.0-dummy1 - // User: 9999.0.2, 9999.0.0-dummy2 + // User: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 // Exe: 9999.0.0, 9999.0.0-dummy0 - // Expected: 9999.0.0-dummy1 from cwd + // Expected: 9999.0.0-dummy1 from User dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "9999.0.0-dummy1")); + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-dummy1")); // Set desired version = 9999.0.0 SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); @@ -218,6 +212,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -226,25 +221,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .And .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.2")); - // Add a production dummy version in CWD - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.0.1"); - - // Version: 9999.0.0 - // CWD: 9999.0.1, 9999.0.0-dummy1 - // User: 9999.0.2, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // Expected: 9999.0.1 from cwd - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "9999.0.1")); - // Remove dummy folders from user dir DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); } @@ -259,18 +235,17 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku var appDll = fixture.TestProject.AppDll; // Add some dummy versions - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.0.1", "9999.0.0-dummy0"); AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.3", "9999.0.0-dummy3"); // Version: 9999.0.0 (through --fx-version arg) - // CWD: 9999.0.1, 9999.0.0-dummy0 // User: 9999.0.2, 9999.0.0-dummy2 // Exe: 9999.0.0, 9999.0.3, 9999.0.0-dummy3 // Expected: 9999.0.0 from exe dir dotnet.Exec("--fx-version", "9999.0.0", appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -280,13 +255,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0")); // Version: 9999.0.0-dummy1 (through --fx-version arg) - // CWD: 9999.0.1, 9999.0.0-dummy0 // User: 9999.0.2, 9999.0.0-dummy2 // Exe: 9999.0.0, 9999.0.3, 9999.0.0-dummy3 // Expected: no compatible version dotnet.Exec("--fx-version", "9999.0.0-dummy1", appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") + .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute(fExpectedToFail:true) @@ -312,15 +287,16 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); - // Add some dummy versions in the cwd - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "10000.1.1", "10000.1.3"); + // Add some dummy versions in the exe + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "10000.1.1", "10000.1.3"); // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through env var - // CWD: 10000.1.1, 10000.1.3 - // Expected: 10000.1.3 from cwd + // exe: 10000.1.1, 10000.1.3 + // Expected: 10000.1.3 from exe dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -329,17 +305,18 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "10000.1.3")); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "10000.1.3")); - // Add a dummy version in the cwd - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.1.1"); + // Add a dummy version in the exe dir + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through env var - // CWD: 9999.1.1, 10000.1.1, 10000.1.3 - // Expected: 9999.1.1 from cwd + // exe: 9999.1.1, 10000.1.1, 10000.1.3 + // Expected: 9999.1.1 from exe dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -348,7 +325,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_cwdSelectedMessage, "9999.1.1")); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.1.1")); } [Fact] @@ -364,15 +341,16 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); SetRuntimeConfigJson(runtimeConfig, "9999.1.1"); - // Add some dummy versions in the cwd - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9998.0.1", "9998.1.0", "9999.0.0", "9999.0.1", "9999.1.0"); + // Add some dummy versions in the exe + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9998.0.1", "9998.1.0", "9999.0.0", "9999.0.1", "9999.1.0"); // Version: 9999.1.1 // 'Roll forward on no candidate fx' enabled through env var - // CWD: 9998.0.1, 9998.1.0, 9999.0.0, 9999.0.1, 9999.1.0 + // exe: 9998.0.1, 9998.1.0, 9999.0.0, 9999.0.1, 9999.1.0 // Expected: no compatible version dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -402,12 +380,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through env var - // CWD: empty // User: empty // Exe: 9999.1.0 // Expected: 9999.1.0 from exe dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -423,12 +401,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through env var - // CWD: empty // User: 9999.1.1 // Exe: 9999.1.0 // Expected: 9999.1.1 from user dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -439,27 +417,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .And .HaveStdErrContaining(_userSelectedMessage); - // Add a dummy version in the cwd - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "10000.0.0"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // CWD: 10000.0.0 - // User: 9999.1.1 - // Exe: 9999.1.0 - // Expected: 10000.0.0 from cwd - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_cwdSelectedMessage); - // Remove dummy folders from user dir DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.1"); } @@ -479,26 +436,9 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 1); // Add some dummy versions - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.1.0"); + AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.0"); AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through runtimeconfig - // CWD: 9999.1.0 - // User: empty - // Exe: 9999.0.0 - // Expected: 9999.1.0 from cwd - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_cwdSelectedMessage); - // Set desired version = 9999.0.0 // Disable 'roll forward on no candidate fx' through runtimeconfig runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); @@ -506,12 +446,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' disabled through runtimeconfig - // CWD: 9999.1.0 - // User: empty + // User: 9999.1.0 // Exe: 9999.0.0 // Expected: 9999.0.0 from exe dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -538,17 +478,17 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 0); // Add some dummy versions - AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.1.0"); + AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.0"); AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through argument - // CWD: 9999.1.0 - // User: empty + // User: 9999.1.0 // Exe: 9999.0.0 - // Expected: 9999.1.0 from cwd + // Expected: 9999.1.0 from User dotnet.Exec("--roll-forward-on-no-candidate-fx", "1", appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -556,7 +496,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_cwdSelectedMessage); + .HaveStdErrContaining(_userSelectedMessage); // Set desired version = 9999.0.0 // Enable 'roll forward on no candidate fx' through Runtimeconfig @@ -564,12 +504,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' disabled through argument - // CWD: 9999.1.0 - // User: empty + // User: 9999.1.0 // Exe: 9999.0.0 // Expected: 9999.0.0 from exe dir dotnet.Exec("--roll-forward-on-no-candidate-fx", "0", appDll) .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() From 5e7425afe49697a21d33fd55dbf21664a7cd3c14 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 27 Apr 2017 15:42:04 -0700 Subject: [PATCH 028/198] Update CoreClr to preview1-25227-02 (#2213) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/projects/Microsoft.NETCore.App/project.json.template | 2 +- .../project.json.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index d5bf585c..b8c5603c 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25227-01"; - public static readonly string JitVersion = "2.0.0-preview1-25227-01"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25227-02"; + public static readonly string JitVersion = "2.0.0-preview1-25227-02"; } } diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index c396665a..16ed558a 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25227-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-02", "Microsoft.DiaSymReader.Native": "1.4.1", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", "NETStandard.Library": "2.0.0-preview1-25227-01" diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 7ae6069b..54fb6a46 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25227-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-02", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", "NETStandard.Library": "2.0.0-preview1-25227-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", From 385d02d96f2e2a717aee7114a281e2af580b6f63 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Mon, 1 May 2017 17:29:25 -0700 Subject: [PATCH 029/198] Build Native Debian installers consuming Portable Linux binaries (#2220) --- .../dotnet-host-build/PackageTargets.cs | 31 ++- .../dotnet-host-build/PrepareTargets.cs | 2 + .../dotnet-host-build/PublishTargets.cs | 16 ++ .../DependencyVersions.cs | 2 +- .../Core-Setup-PortableLinux-x64.json | 212 +++++++++++++++++- buildpipeline/pipeline.json | 98 +++----- scripts/dockerbuild.sh | 84 +++++++ scripts/dockerrun.sh | 40 +--- 8 files changed, 365 insertions(+), 120 deletions(-) create mode 100755 scripts/dockerbuild.sh diff --git a/build_projects/dotnet-host-build/PackageTargets.cs b/build_projects/dotnet-host-build/PackageTargets.cs index 645c50df..f276ddb5 100644 --- a/build_projects/dotnet-host-build/PackageTargets.cs +++ b/build_projects/dotnet-host-build/PackageTargets.cs @@ -68,9 +68,11 @@ namespace Microsoft.DotNet.Host.Build Directory.CreateDirectory(sharedHostRoot); - foreach (var file in Directory.GetFiles(Dirs.SharedFrameworkPublish, "*", SearchOption.TopDirectoryOnly)) + string sharedFrameworkPublishPath = GetSharedFrameworkPublishPath(c); + + foreach (var file in Directory.GetFiles(sharedFrameworkPublishPath, "*", SearchOption.TopDirectoryOnly)) { - var destFile = file.Replace(Dirs.SharedFrameworkPublish, sharedHostRoot); + var destFile = file.Replace(sharedFrameworkPublishPath, sharedHostRoot); File.Copy(file, destFile, true); c.Warn(destFile); } @@ -99,7 +101,7 @@ namespace Microsoft.DotNet.Host.Build Directory.CreateDirectory(hostFxrRoot); - string srcHostDir = Path.Combine(Dirs.SharedFrameworkPublish, "host"); + string srcHostDir = Path.Combine(GetSharedFrameworkPublishPath(c), "host"); string destHostDir = Path.Combine(hostFxrRoot, "host"); FS.CopyRecursive(srcHostDir, destHostDir); @@ -119,7 +121,8 @@ namespace Microsoft.DotNet.Host.Build } Directory.CreateDirectory(sharedFxRoot); - Utils.CopyDirectoryRecursively(Path.Combine(Dirs.SharedFrameworkPublish, "shared"), sharedFxRoot, true); + + Utils.CopyDirectoryRecursively(Path.Combine(GetSharedFrameworkPublishPath(c), "shared"), sharedFxRoot, true); FixPermissions(sharedFxRoot); c.BuildContext["SharedFrameworkPublishRoot"] = sharedFxRoot; @@ -266,5 +269,25 @@ namespace Microsoft.DotNet.Host.Build FS.FixModeFlags(directory); } } + + private static string GetSharedFrameworkPublishPath(BuildTargetContext c) + { + string sharedFrameworkPublishPath = string.Empty; + + string preBuiltPortableStagingPath=c.BuildContext.Get("PortableBuildStagingLocation"); + + // If we are not generating distro specific installers for portable build, then we won't have access to staging location and thus, will use default binary location where SharedFX was published + if(preBuiltPortableStagingPath == null) + { + sharedFrameworkPublishPath = Dirs.SharedFrameworkPublish; + } + else + { + Console.WriteLine($"Installers will package binaries from path set by PORTABLE_BUILD_STAGING_LOCATION environment variable :{preBuiltPortableStagingPath}"); + sharedFrameworkPublishPath = preBuiltPortableStagingPath; + } + + return sharedFrameworkPublishPath; + } } } diff --git a/build_projects/dotnet-host-build/PrepareTargets.cs b/build_projects/dotnet-host-build/PrepareTargets.cs index 3d4e6d23..1ce5cae1 100644 --- a/build_projects/dotnet-host-build/PrepareTargets.cs +++ b/build_projects/dotnet-host-build/PrepareTargets.cs @@ -127,6 +127,7 @@ namespace Microsoft.DotNet.Host.Build Environment.SetEnvironmentVariable("TARGETRID", targetRID); } + string portableBuildStagingLocation = Environment.GetEnvironmentVariable("PORTABLE_BUILD_STAGING_LOCATION")?.Trim(); c.BuildContext["TargetRID"] = targetRID; @@ -135,6 +136,7 @@ namespace Microsoft.DotNet.Host.Build c.BuildContext["ArtifactsTargetRID"] = realTargetRID; c.BuildContext["LinkPortable"] = linkPortable; c.BuildContext["Platform"] = platformEnv; + c.BuildContext["PortableBuildStagingLocation"] = portableBuildStagingLocation; return c.Success(); } diff --git a/build_projects/dotnet-host-build/PublishTargets.cs b/build_projects/dotnet-host-build/PublishTargets.cs index 908a092f..badd240c 100644 --- a/build_projects/dotnet-host-build/PublishTargets.cs +++ b/build_projects/dotnet-host-build/PublishTargets.cs @@ -58,6 +58,15 @@ namespace Microsoft.DotNet.Host.Build return c.Success(); } + [Target(nameof(PrepareTargets.Init), + nameof(PublishTargets.InitPublish), + nameof(PublishTargets.PublishInstallerArtifacts))] + [Environment("PUBLISH_TO_AZURE_BLOB", "1", "true")] // This is set by CI systems + public static BuildTargetResult PublishInstallers(BuildTargetContext c) + { + return c.Success(); + } + [Target] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] [BuildArchitectures(BuildArchitecture.x64)] @@ -263,6 +272,13 @@ namespace Microsoft.DotNet.Host.Build nameof(PublishTargets.PublishSharedFrameworkVersionBadge))] public static BuildTargetResult PublishArtifacts(BuildTargetContext c) => c.Success(); + [Target( + nameof(PublishTargets.PublishInstallerFilesToAzure), + nameof(PublishTargets.PublishDotnetDebToolPackage), + nameof(PublishTargets.PublishDebFilesToDebianRepo), + nameof(PublishTargets.PublishSharedFrameworkVersionBadge))] + public static BuildTargetResult PublishInstallerArtifacts(BuildTargetContext c) => c.Success(); + [Target( nameof(PublishTargets.PublishSharedHostInstallerFileToAzure), nameof(PublishTargets.PublishHostFxrInstallerFileToAzure), diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index b8c5603c..5ef90e85 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; diff --git a/buildpipeline/Core-Setup-PortableLinux-x64.json b/buildpipeline/Core-Setup-PortableLinux-x64.json index 5626f166..6b53eeb0 100644 --- a/buildpipeline/Core-Setup-PortableLinux-x64.json +++ b/buildpipeline/Core-Setup-PortableLinux-x64.json @@ -95,6 +95,178 @@ "failOnStandardError": "false" } }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Copy built Portable binaries to staging directory", + "timeoutInMinutes": 0, + "task": { + "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "SourceFolder": "$(Build.SourcesDirectory)/artifacts/linux-x64/intermediate/sharedFrameworkPublish", + "Contents": "**", + "TargetFolder": "$(Build.StagingDirectory)/sharedFrameworkPublish", + "CleanTargetFolder": "false", + "OverWrite": "false", + "flattenFolders": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Ubuntu.14.04 docker image", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerbuild.sh", + "args": "-d $(Build.SourcesDirectory)/scripts/docker/ubuntu.14.04 -t ubuntu.14.04-coresetup", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Debian Installer in Ubuntu.14.04 docker container", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerrun-as-current-user.sh", + "args": "--rm $(DockerBuildEnvironmentVariables) -e CLI_NUGET_API_KEY -e CLI_NUGET_FEED_URL -e CLI_NUGET_SYMBOLS_FEED_URL -v $(Build.SourcesDirectory):/opt/code/ -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/opt/sharedFrameworkPublish/ -w /opt/code ubuntu.14.04-coresetup /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh --skip-prereqs --configuration Release --targets $(InstallerOnlyBuildArguments)\"", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Ubuntu.16.04 docker image", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerbuild.sh", + "args": "-d $(Build.SourcesDirectory)/scripts/docker/ubuntu.16.04 -t ubuntu.16.04-coresetup", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Debian Installer in Ubuntu.16.04 docker container", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerrun-as-current-user.sh", + "args": "--rm $(DockerBuildEnvironmentVariables) -v $(Build.SourcesDirectory):/opt/code/ -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/opt/sharedFrameworkPublish/ -w /opt/code ubuntu.16.04-coresetup /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh --skip-prereqs --configuration Release --targets $(InstallerOnlyBuildArguments)\"", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Ubuntu.16.10 docker image", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerbuild.sh", + "args": "-d $(Build.SourcesDirectory)/scripts/docker/ubuntu.16.10 -t ubuntu.16.10-coresetup", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Debian Installer in Ubuntu 16.10 docker container", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerrun-as-current-user.sh", + "args": "--rm $(DockerBuildEnvironmentVariables) -v $(Build.SourcesDirectory):/opt/code/ -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/opt/sharedFrameworkPublish/ -w /opt/code ubuntu.16.10-coresetup /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh --skip-prereqs --configuration Release --targets $(InstallerOnlyBuildArguments)\"", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Debian.8 docker image ", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerbuild.sh", + "args": "-d $(Build.SourcesDirectory)/scripts/docker/debian.8 -t debian.8-coresetup", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build Debian Installer in Debian.8 docker container", + "timeoutInMinutes": 0, + "task": { + "id": "6c731c3c-3c68-459a-a5c9-bde6e6595b5b", + "versionSpec": "2.*", + "definitionType": "task" + }, + "inputs": { + "scriptPath": "scripts/dockerrun-as-current-user.sh", + "args": "--rm $(DockerBuildEnvironmentVariables) -v $(Build.SourcesDirectory):/opt/code/ -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/opt/sharedFrameworkPublish/ -w /opt/code debian.8-coresetup /bin/bash -c \"HOME=/opt/code; git clean -X -d -f; ./build.sh --skip-prereqs --configuration Release --targets $(InstallerOnlyBuildArguments)\"", + "disableAutoCwd": "false", + "cwd": "", + "failOnStandardError": "false" + } + }, { "enabled": true, "continueOnError": true, @@ -241,6 +413,33 @@ }, "NUGET_SYMBOLS_FEED_URL": { "value": "https://dotnet.myget.org/F/dotnet-core/symbols/api/v2/package" + }, + "REPO_ID": { + "value": "579f8fb0fedca9aeeb399132" + }, + "REPO_USER": { + "value": "dotnet" + }, + "REPO_PASS": { + "value": "PassedViaPipeBuild" + }, + "REPO_SERVER": { + "value": "azure-apt-cat.cloudapp.net" + }, + "DockerBuildEnvironmentVariables": { + "value": "-e PORTABLE_BUILD_STAGING_LOCATION=/opt/sharedFrameworkPublish -e CONNECTION_STRING -e PUBLISH_TO_AZURE_BLOB -e REPO_ID -e REPO_USER -e REPO_PASS -e REPO_SERVER -e NUGET_FEED_URL -e NUGET_API_KEY -e NUGET_SYMBOLS_FEED_URL -e GITHUB_PASSWORD" + }, + "InstallerOnlyBuildArguments": { + "value": "Init,Prepare,InitPackage,GenerateVersionBadge,GenerateInstaller,TestInstaller,PublishInstallers" + }, + "CLI_NUGET_API_KEY": { + "value": "PassedViaPipeBuild" + }, + "CLI_NUGET_FEED_URL": { + "value": "https://dotnet.myget.org/F/cli-deps/api/v2/package" + }, + "CLI_NUGET_SYMBOLS_FEED_URL": { + "value": "https://dotnet.myget.org/F/cli-deps/symbols/api/v2/package" } }, "demands": [ @@ -265,6 +464,7 @@ "buildNumberFormat": "$(Date:yyyMMdd)$(Rev:.r)", "jobAuthorizationScope": "projectCollection", "jobTimeoutInMinutes": 90, + "jobCancelTimeoutInMinutes": 5, "badgeEnabled": true, "repository": { "properties": { @@ -288,23 +488,23 @@ }, "quality": "definition", "queue": { + "id": 36, + "name": "DotNet-Build", "pool": { "id": 39, "name": "DotNet-Build" - }, - "id": 36, - "name": "DotNet-Build" + } }, - "path": "\\", - "type": "build", "id": 4573, "name": "Core-Setup-PortableLinux-x64", + "path": "\\", + "type": "build", "project": { "id": "0bdbc590-a062-4c3f-b0f6-9383f67865ee", "name": "DevDiv", "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097620 + "revision": 418097642 } } \ No newline at end of file diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index a7bce991..b8fbb98f 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -15,65 +15,7 @@ "BuildConfiguration": "Release" }, "Definitions": [ - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "debian.8", - "REPO_ID": "579f8fb0fedca9aeeb399132", - "REPO_USER": "dotnet", - "REPO_SERVER": "azure-apt-cat.cloudapp.net" - }, - "ReportingParameters": { - "OperatingSystem": "Debian 8.2", - "Type": "build/product/", - "Platform": "x64" - } - }, - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "ubuntu.14.04", - "REPO_ID": "562fbfe0b2d7d0e0a43780c4", - "REPO_USER": "dotnet", - "REPO_SERVER": "azure-apt-cat.cloudapp.net", - "CLI_NUGET_FEED_URL": "https://dotnet.myget.org/F/cli-deps/api/v2/package", - "CLI_NUGET_SYMBOLS_FEED_URL": "https://dotnet.myget.org/F/cli-deps/symbols/api/v2/package" - }, - "ReportingParameters": { - "OperatingSystem": "Ubuntu 14.04", - "Type": "build/product/", - "Platform": "x64" - } - }, - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "ubuntu.16.04", - "REPO_ID": "575f40f3797ef7280505232f", - "REPO_USER": "dotnet", - "REPO_SERVER": "azure-apt-cat.cloudapp.net" - }, - "ReportingParameters": { - "OperatingSystem": "Ubuntu 16.04", - "Type": "build/product/", - "Platform": "x64" - } - }, - { - "Name": "Core-Setup-Linux", - "Parameters": { - "PB_DockerOS": "ubuntu.16.10", - "REPO_ID": "575f40f3797ef7280505232f", - "REPO_USER": "dotnet", - "REPO_SERVER": "azure-apt-cat.cloudapp.net" - }, - "ReportingParameters": { - "OperatingSystem": "Ubuntu 16.10", - "Type": "build/product/", - "Platform": "x64" - } - }, - { + { "Name": "Core-Setup-OSX-x64", "Parameters": { "PB_PortableBuild": "-portable" @@ -97,18 +39,6 @@ "Platform": "x64" } }, - { - "Name": "Core-Setup-Signing-Windows-x64", - "Parameters": { - "PB_PortableBuild": "-portable" - }, - "ReportingParameters": { - "OperatingSystem": "Windows", - "SubType": "PortableBuild", - "Type": "build/product/", - "Platform": "x64" - } - }, { "Name": "Core-Setup-Signing-Windows-x86", "Parameters": { @@ -160,6 +90,32 @@ } } ] + }, + { + "Name": "Trusted-Finalize-Release", + "Parameters": { + "TreatWarningsAsErrors": "false" + }, + "BuildParameters": { + "BuildConfiguration": "Release" + }, + "Definitions": [ + { + "Name": "Core-Setup-Signing-Windows-x64", + "Parameters": { + "PB_PortableBuild": "-portable" + }, + "ReportingParameters": { + "OperatingSystem": "Windows", + "SubType": "PortableBuild", + "Type": "build/product/", + "Platform": "x64" + } + } + ], + "DependsOn": [ + "Trusted-All-Release" + ] } ] } \ No newline at end of file diff --git a/scripts/dockerbuild.sh b/scripts/dockerbuild.sh new file mode 100755 index 00000000..6f15ca8e --- /dev/null +++ b/scripts/dockerbuild.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +set -e + +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink + DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + SOURCE="$(readlink "$SOURCE")" + [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located +done +DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" + +cd "$DIR/.." + +while [[ $# > 0 ]]; do + key=$1 + + case $key in + -t|--tag) + DOCKER_TAG=$2 + shift + ;; + -d|--dockerfile) + DOCKERFILE=$2 + shift + ;; + -h|-?|--help) + echo "Usage: $0 [-d|--dockerfile ] [-t|--tag ] " + echo "" + echo "Options:" + echo " The path to the folder that contains a Dockerfile to use to create the build container" + echo " The name of docker image tag" + exit 0 + ;; + *) + break # the first non-switch we get ends parsing + ;; + esac + + shift +done + +# Executes a command and retries if it fails. +# NOTE: This function is the exact copy from init-docker.sh. +# Reason for not invoking init.docker.sh directly is since that script +# also performs cleanup, which we do not want in this case. +execute() { + local count=0 + local retries=5 + local waitFactor=6 + until "$@"; do + local exit=$? + count=$(( $count + 1 )) + if [ $count -lt $retries ]; then + local wait=$(( waitFactor ** (( count - 1 )) )) + echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." + sleep $wait + else + say_err "Retry $count/$retries exited $exit, no more retries left." + return $exit + fi + done + + return 0 +} + +# Build the docker container (will be fast if it is already built) +echo "Building Docker Container using Dockerfile: $DOCKERFILE" + +# Get the name of Docker image. +image=$(grep -i "^FROM " "$DOCKERFILE/Dockerfile" | awk '{ print $2 }') + +# Explicitly pull the base image with retry logic. +# This eliminates intermittent failures during docker build caused by failing to retrieve the base image. +if [ ! -z "$image" ]; then + echo "Pulling Docker image $image" + execute docker pull $image +fi + +docker build --build-arg USER_ID=$(id -u) -t $DOCKER_TAG $DOCKERFILE diff --git a/scripts/dockerrun.sh b/scripts/dockerrun.sh index 80f3d089..4d5a3d85 100755 --- a/scripts/dockerrun.sh +++ b/scripts/dockerrun.sh @@ -87,44 +87,8 @@ fi # VSO [ ! -z "$BUILD_BUILDID" ] && DOTNET_BUILD_CONTAINER_NAME="${BUILD_BUILDID}-${BUILD_BUILDNUMBER}" -# Executes a command and retries if it fails. -# NOTE: This function is the exact copy from init-docker.sh. -# Reason for not invoking init.docker.sh directly is since that script -# also performs cleanup, which we do not want in this case. -execute() { - local count=0 - local retries=5 - local waitFactor=6 - until "$@"; do - local exit=$? - count=$(( $count + 1 )) - if [ $count -lt $retries ]; then - local wait=$(( waitFactor ** (( count - 1 )) )) - echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." - sleep $wait - else - say_err "Retry $count/$retries exited $exit, no more retries left." - return $exit - fi - done - - return 0 -} - -# Build the docker container (will be fast if it is already built) -echo "Building Docker Container using Dockerfile: $DOCKERFILE" - -# Get the name of Docker image. -image=$(grep -i "^FROM " "$DOCKERFILE/Dockerfile" | awk '{ print $2 }') - -# Explicitly pull the base image with retry logic. -# This eliminates intermittent failures during docker build caused by failing to retrieve the base image. -if [ ! -z "$image" ]; then - echo "Pulling Docker image $image" - execute docker pull $image -fi - -docker build --build-arg USER_ID=$(id -u) -t $DOTNET_BUILD_CONTAINER_TAG $DOCKERFILE +#Build the docker image +"$DIR/dockerbuild.sh" -t $DOTNET_BUILD_CONTAINER_TAG -d $DOCKERFILE # Run the build in the container echo "Launching build in Docker Container" From fdcba72089cc70d07aac9bdf0db0cbbaf2c62766 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Mon, 1 May 2017 18:06:21 -0700 Subject: [PATCH 030/198] Update dummy.txt Requesting a new build --- Documentation/dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dummy.txt b/Documentation/dummy.txt index eb98ae5b..aa45253a 100644 --- a/Documentation/dummy.txt +++ b/Documentation/dummy.txt @@ -1 +1 @@ -4/27/2017 09:50:50 AM +5/01/2017 06:06:50 PM From 36a61242bd1653c535c72cf92a9cd551d085c6c7 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Mon, 1 May 2017 18:35:38 -0700 Subject: [PATCH 031/198] Update dummy.txt Kicking off another build manually. --- Documentation/dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dummy.txt b/Documentation/dummy.txt index aa45253a..e04eec43 100644 --- a/Documentation/dummy.txt +++ b/Documentation/dummy.txt @@ -1 +1 @@ -5/01/2017 06:06:50 PM +5/01/2017 06:34:50 PM From 1640dfe441894253909525a959c20af98a38b116 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Mon, 1 May 2017 19:05:51 -0700 Subject: [PATCH 032/198] Update dummy.txt --- Documentation/dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dummy.txt b/Documentation/dummy.txt index e04eec43..3a633a63 100644 --- a/Documentation/dummy.txt +++ b/Documentation/dummy.txt @@ -1 +1 @@ -5/01/2017 06:34:50 PM +5/01/2017 07:05:00 PM From 86fe9816c8ba782241c441c3228c665e393c3ef3 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Mon, 1 May 2017 19:44:00 -0700 Subject: [PATCH 033/198] Update CoreClr, CoreFx, Standard to preview1-25301-02, preview1-25302-01, preview1-25301-01, respectively (#2217) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 8 ++++---- .../project.json.template | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 5ef90e85..8326a47d 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25227-02"; - public static readonly string JitVersion = "2.0.0-preview1-25227-02"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25301-02"; + public static readonly string JitVersion = "2.0.0-preview1-25301-02"; } } diff --git a/pkg/deps/project.json b/pkg/deps/project.json index e5eff129..ce045c73 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index 245010ee..c8f39573 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25227-04\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25302-01\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index 16ed558a..55330b8e 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25227-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-02", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25302-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", - "NETStandard.Library": "2.0.0-preview1-25227-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", + "NETStandard.Library": "2.0.0-preview1-25301-01" }, "frameworks": { "netcoreapp2.0": {} diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 54fb6a46..138105d3 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,10 +1,10 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25227-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25227-02", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25227-04", - "NETStandard.Library": "2.0.0-preview1-25227-01", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25302-01", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", + "NETStandard.Library": "2.0.0-preview1-25301-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", "System.ServiceModel.NetTcp": "4.4.0-beta-25205-01", From 5ed924b67b97b1510b5328fdc6d52e495554e519 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 2 May 2017 08:12:35 -0700 Subject: [PATCH 034/198] Update CoreClr to preview1-25302-01 (#2251) --- .../shared-build-targets-utils/DependencyVersions.cs | 4 ++-- pkg/projects/Microsoft.NETCore.App/project.json.template | 2 +- .../project.json.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build_projects/shared-build-targets-utils/DependencyVersions.cs b/build_projects/shared-build-targets-utils/DependencyVersions.cs index 8326a47d..373ecf62 100644 --- a/build_projects/shared-build-targets-utils/DependencyVersions.cs +++ b/build_projects/shared-build-targets-utils/DependencyVersions.cs @@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build { public class DependencyVersions { - public static readonly string CoreCLRVersion = "2.0.0-preview1-25301-02"; - public static readonly string JitVersion = "2.0.0-preview1-25301-02"; + public static readonly string CoreCLRVersion = "2.0.0-preview1-25302-01"; + public static readonly string JitVersion = "2.0.0-preview1-25302-01"; } } diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index 55330b8e..d797866b 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25302-01", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25302-01", "Microsoft.DiaSymReader.Native": "1.4.1", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", "NETStandard.Library": "2.0.0-preview1-25301-01" diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 138105d3..9e6dcb82 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -2,7 +2,7 @@ "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25302-01", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25301-02", + "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25302-01", "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", "NETStandard.Library": "2.0.0-preview1-25301-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", From ed77ccc1c32266300696eaf949f0077047caa126 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 4 May 2017 13:39:43 -0500 Subject: [PATCH 035/198] DependencyModel continue on on file not found Now that we have runtime package stores, there are package paths that don't contain all of the reference assemblies. Runtime package stores actually don't have any reference assemblies. When DependencyModel is given a runtime package store and a NuGet cache directory (in that order), it needs to keep looking in all the package paths it is given before throwing an exception. --- .../PackageCompilationAssemblyResolver.cs | 31 ++++++++++++++++-- .../Resolution/ResolverUtils.cs | 15 --------- .../PackageResolverTest.cs | 32 ++++++++++++++++--- 3 files changed, 56 insertions(+), 22 deletions(-) diff --git a/src/Microsoft.Extensions.DependencyModel/Resolution/PackageCompilationAssemblyResolver.cs b/src/Microsoft.Extensions.DependencyModel/Resolution/PackageCompilationAssemblyResolver.cs index 11ac57bb..82976ae6 100644 --- a/src/Microsoft.Extensions.DependencyModel/Resolution/PackageCompilationAssemblyResolver.cs +++ b/src/Microsoft.Extensions.DependencyModel/Resolution/PackageCompilationAssemblyResolver.cs @@ -95,11 +95,38 @@ namespace Microsoft.Extensions.DependencyModel.Resolution if (ResolverUtils.TryResolvePackagePath(_fileSystem, library, directory, out packagePath)) { - assemblies.AddRange(ResolverUtils.ResolveFromPackagePath(_fileSystem, library, packagePath)); - return true; + IEnumerable fullPathsFromPackage; + if (TryResolveFromPackagePath(_fileSystem, library, packagePath, out fullPathsFromPackage)) + { + assemblies.AddRange(fullPathsFromPackage); + return true; + } } } return false; } + + private static bool TryResolveFromPackagePath(IFileSystem fileSystem, CompilationLibrary library, string basePath, out IEnumerable results) + { + var paths = new List(); + + foreach (var assembly in library.Assemblies) + { + string fullName; + if (!ResolverUtils.TryResolveAssemblyFile(fileSystem, basePath, assembly, out fullName)) + { + // if one of the files can't be found, skip this package path completely. + // there are package paths that don't include all of the "ref" assemblies + // (ex. ones created by 'dotnet store') + results = null; + return false; + } + + paths.Add(fullName); + } + + results = paths; + return true; + } } } diff --git a/src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs b/src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs index db4d7b19..084b915b 100644 --- a/src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs +++ b/src/Microsoft.Extensions.DependencyModel/Resolution/ResolverUtils.cs @@ -1,8 +1,6 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; -using System.Collections.Generic; using System.IO; namespace Microsoft.Extensions.DependencyModel.Resolution @@ -26,19 +24,6 @@ namespace Microsoft.Extensions.DependencyModel.Resolution return false; } - internal static IEnumerable ResolveFromPackagePath(IFileSystem fileSystem, CompilationLibrary library, string basePath) - { - foreach (var assembly in library.Assemblies) - { - string fullName; - if (!TryResolveAssemblyFile(fileSystem, basePath, assembly, out fullName)) - { - throw new InvalidOperationException($"Cannot find assembly file for package {library.Name} at '{fullName}'"); - } - yield return fullName; - } - } - internal static bool TryResolveAssemblyFile(IFileSystem fileSystem, string basePath, string assemblyPath, out string fullName) { fullName = Path.Combine(basePath, assemblyPath); diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs b/test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs index 6d15234e..f87287d8 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs +++ b/test/Microsoft.Extensions.DependencyModel.Tests/PackageResolverTest.cs @@ -70,7 +70,6 @@ namespace Microsoft.Extensions.DependencyModel.Tests assemblies.Should().Contain(Path.Combine(packagePath, F.SecondAssemblyPath)); } - [Fact] public void FailsWhenOneOfAssembliesNotFound() { @@ -83,10 +82,33 @@ namespace Microsoft.Extensions.DependencyModel.Tests var resolver = new PackageCompilationAssemblyResolver(fileSystem, new string[] { PackagesPath }); var assemblies = new List(); - var exception = Assert.Throws(() => resolver.TryResolveAssemblyPaths(library, assemblies)); - exception.Message.Should() - .Contain(F.SecondAssemblyPath) - .And.Contain(library.Name); + resolver.TryResolveAssemblyPaths(library, assemblies) + .Should().BeFalse(); + + assemblies.Should().BeEmpty(); + } + + [Fact] + public void KeepsLookingWhenOneOfAssembliesNotFound() + { + var packagePath1 = GetPackagesPath(F.DefaultPackageName, F.DefaultVersion); + var secondPath = "secondPath"; + var packagePath2 = GetPackagesPath(secondPath, F.DefaultPackageName, F.DefaultVersion); + var fileSystem = FileSystemMockBuilder.Create() + .AddFiles(packagePath1, F.DefaultAssemblyPath) + .AddFiles(packagePath2, F.DefaultAssemblyPath, F.SecondAssemblyPath) + .Build(); + var library = F.Create(assemblies: F.TwoAssemblies); + + var resolver = new PackageCompilationAssemblyResolver(fileSystem, new string[] { PackagesPath, secondPath }); + var assemblies = new List(); + + resolver.TryResolveAssemblyPaths(library, assemblies) + .Should().BeTrue(); + + assemblies.Should().HaveCount(2); + assemblies.Should().Contain(Path.Combine(packagePath2, F.DefaultAssemblyPath)); + assemblies.Should().Contain(Path.Combine(packagePath2, F.SecondAssemblyPath)); } private static string GetPackagesPath(string id, string version) From 7035b36ba236b17fbd787f596c61621f3f7bb74b Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 4 May 2017 18:12:59 -0700 Subject: [PATCH 036/198] Update CoreFx to preview1-25305-02 --- pkg/deps/project.json | 2 +- pkg/dir.props | 2 +- pkg/projects/Microsoft.NETCore.App/project.json.template | 4 ++-- .../project.json.template | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/deps/project.json b/pkg/deps/project.json index ce045c73..268470d4 100644 --- a/pkg/deps/project.json +++ b/pkg/deps/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25305-02" }, "frameworks": { "dnxcore50": { diff --git a/pkg/dir.props b/pkg/dir.props index c8f39573..b49ca4ac 100644 --- a/pkg/dir.props +++ b/pkg/dir.props @@ -42,7 +42,7 @@ $(PackagesOutDir) $(SymbolPackagesOutDir) - $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25302-01\runtime.json + $(ProjectDir)packages\Microsoft.NETCore.Platforms\2.0.0-preview1-25305-02\runtime.json $(ProjectDir)projects/dotnet_library_license.txt $(ProjectDir)projects/ThirdPartyNotices.txt $(ProjectDir)projects/descriptions.json diff --git a/pkg/projects/Microsoft.NETCore.App/project.json.template b/pkg/projects/Microsoft.NETCore.App/project.json.template index d797866b..76c83022 100644 --- a/pkg/projects/Microsoft.NETCore.App/project.json.template +++ b/pkg/projects/Microsoft.NETCore.App/project.json.template @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25302-01", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25305-02", "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25302-01", "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25305-02", "NETStandard.Library": "2.0.0-preview1-25301-01" }, "frameworks": { diff --git a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template index 9e6dcb82..e669b227 100644 --- a/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template +++ b/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/project.json.template @@ -1,9 +1,9 @@ { "dependencies": { "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25302-01", + "Microsoft.Private.CoreFx.UAP": "4.4.0-preview1-25305-02", "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25302-01", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25302-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview1-25305-02", "NETStandard.Library": "2.0.0-preview1-25301-01", "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", "System.ServiceModel.Http": "4.4.0-beta-25205-01", From 767078077c61a52d8e549a627fcd37235ec91bae Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Wed, 17 May 2017 10:03:21 -0700 Subject: [PATCH 037/198] Merge netci.groovy from master to release/2.0.0 --- netci.groovy | 140 +++++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 67 deletions(-) diff --git a/netci.groovy b/netci.groovy index 884e8554..c7e20c89 100644 --- a/netci.groovy +++ b/netci.groovy @@ -10,7 +10,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:arm:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Fedora24:x64:Debug', 'OpenSUSE42.1:x64:Debug'] +def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu16.04:arm:Release', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Fedora24:x64:Debug', 'OpenSUSE42.1:x64:Debug', 'Tizen:armel:Release'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -25,49 +25,55 @@ platformList.each { platform -> def buildCommand = ''; def osForGHTrigger = os def version = "latest-or-auto" + def dockerRepository = "microsoft/dotnet-buildtools-prereqs" + def dockerContainer = '' + def dockerWorkingDirectory = "/src/core-setup" + def dockerCommand = '' + def crossbuildargs = '' // Calculate build command if (os == 'Windows_NT') { - if (architecture == 'arm') { - buildCommand = ".\\build.cmd -Configuration ${configuration} -TargetArch ${architecture} -Targets Default" - } - else { - buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -Targets Default" + buildCommand = ".\\build.cmd -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + if ((architecture == 'arm' || architecture == 'arm64')) { + buildCommand += " -PortableBuild=true -SkipTests=true" } + } + else if (os == 'Tizen') { + dockerRepository = "hqueue/dotnetcore" + dockerContainer = "ubuntu1404_cross_prereqs_v4-tizen_rootfs" + dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture}.tizen.build --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" + buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" } - else if (os == 'Windows_2016') { - buildCommand = ".\\build.cmd -Configuration ${configuration} -Architecture ${architecture} -RunInstallerTestsInDocker -Targets Default" - } - else if ((os.startsWith("Ubuntu") || os.startsWith("Tizen")) && + else if ((os.startsWith("Ubuntu")) && (architecture == 'arm' || architecture == 'armel')) { - def linuxcodename = ''; + if (os == 'Ubuntu') { - version = "arm-cross-latest" - linuxcodename = 'trusty' + dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239" + crossbuildargs = " -CrossBuild=true" } else if (os == 'Ubuntu16.04') { - version = "latest-or-auto-docker" - linuxcodename = 'xenial' + dockerContainer = "ubuntu-16.04-cross-ef0ac75-20175511035548" } - - // Call the arm32_ci_script.sh script to perform the cross build by using docker - buildCommand = "./scripts/arm32_ci_script.sh --buildConfig=${configuration} --${architecture} --linuxCodeName=${linuxcodename} --verbose" + dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" + buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -PortableBuild=true -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true${crossbuildargs}" } - else if (os == 'Ubuntu') { - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default" + else if (os == "Ubuntu") { + dockerContainer = "ubuntu-14.04-debpkg-e5cf912-20175003025046" + dockerCommand = "docker run --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" + buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + } + else if (os == "PortableLinux") { + // Jenkins non-Ubuntu CI machines don't have docker + buildCommand = "./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -PortableBuild=true" + + // Trigger a portable Linux build that runs on RHEL7.2 + osForGHTrigger = "PortableLinux" + os = "RHEL7.2" } else { // Jenkins non-Ubuntu CI machines don't have docker - buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" - - if (os == 'PortableLinux') { - - // Trigger a portable Linux build that runs on RHEL7.2 - buildCommand += " -portable" - osForGHTrigger = "PortableLinux" - os = "RHEL7.2" - } + buildCommand = "./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" } def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { @@ -87,8 +93,8 @@ platformList.each { platform -> Utilities.setMachineAffinity(newJob, os, version) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - if (!(os == 'Windows_NT' && architecture == 'arm')) { - Utilities.addXUnitDotNETResults(newJob, '**/*-testResults.xml') + if (!(architecture == 'arm')) { + Utilities.addMSTestResults(newJob, '**/*-testResults.trx') } if (os == 'Ubuntu16.04' && architecture == 'arm') { @@ -101,7 +107,7 @@ platformList.each { platform -> } ArchivalSettings settings = new ArchivalSettings(); - def archiveString = ["tar.gz", "zip", "deb", "msi", "pkg", "exe", "nupkg"].collect { "artifacts/*/packages/*.${it},artifacts/*/corehost/*.${it},pkg/bin/packages/*.${it}" }.join(",") + def archiveString = ["tar.gz", "zip", "deb", "msi", "pkg", "exe", "nupkg"].collect { "Bin/*/packages/*.${it},Bin/*/corehost/*.${it}" }.join(",") settings.addFiles(archiveString) settings.setArchiveOnSuccess() settings.setFailIfNothingArchived() @@ -112,41 +118,41 @@ platformList.each { platform -> // ************************** // Define ARM64 building. // ************************** -['Windows_NT'].each { os -> - ['Release'].each { configurationGroup -> - def newJobName = "${configurationGroup.toLowerCase()}_${os.toLowerCase()}_arm64" - def arm64Users = ['ianhays', 'kyulee1', 'gkhanna79', 'weshaggard', 'stephentoub', 'rahku', 'ramarag'] - def newJob = job(Utilities.getFullJobName(project, newJobName, /* isPR */ false)) { - steps { - // build the world, but don't run the tests - batchFile("build.cmd -Configuration ${configurationGroup} -Targets Init,Compile,Package,Publish -Architecure x64 -TargetArch arm64 -ToolsetDir C:\\ats2 -Framework netcoreapp1.1") - } - label("arm64") - - // Kick off the test run - publishers { - archiveArtifacts { - pattern("artifacts/win10-arm64/packages/*.zip") - pattern("artifacts/win10-arm64/corehost/*.nupkg") - onlyIfSuccessful(true) - allowEmpty(false) - } - } - } - - // Set up standard options. - Utilities.standardJobSetup(newJob, project, /* isPR */ false, "*/${branch}") - - // Set a daily trigger - Utilities.addPeriodicTrigger(newJob, '@daily') - - // Set up a PR trigger that is only triggerable by certain members - Utilities.addPrivateGithubPRTriggerForBranch(newJob, branch, "Windows_NT ARM64 ${configurationGroup} Build", "(?i).*test\\W+ARM64\\W+${os}\\W+${configurationGroup}", null, arm64Users) - - // Set up a per-push trigger - Utilities.addGithubPushTrigger(newJob) - } -} +//['Windows_NT'].each { os -> +// ['Release'].each { configurationGroup -> +// def newJobName = "${configurationGroup.toLowerCase()}_${os.toLowerCase()}_arm64" +// def arm64Users = ['ianhays', 'kyulee1', 'gkhanna79', 'weshaggard', 'stephentoub', 'rahku', 'ramarag'] +// def newJob = job(Utilities.getFullJobName(project, newJobName, /* isPR */ false)) { +// steps { +// // build the world, but don't run the tests +// batchFile("build.cmd -ConfigurationGroup ${configurationGroup} -Architecure x64 -TargetArch arm64 -ToolsetDir C:\\ats2 -Framework netcoreapp1.1") +// } +// label("arm64") +// +// // Kick off the test run +// publishers { +// archiveArtifacts { +// pattern("artifacts/win10-arm64/packages/*.zip") +// pattern("artifacts/win10-arm64/corehost/*.nupkg") +// onlyIfSuccessful(true) +// allowEmpty(false) +// } +// } +// } +// +// // Set up standard options. +// Utilities.standardJobSetup(newJob, project, /* isPR */ false, "*/${branch}") +// +// // Set a daily trigger +// Utilities.addPeriodicTrigger(newJob, '@daily') +// +// // Set up a PR trigger that is only triggerable by certain members +// Utilities.addPrivateGithubPRTriggerForBranch(newJob, branch, "Windows_NT ARM64 ${configurationGroup} Build", "(?i).*test\\W+ARM64\\W+${os}\\W+${configurationGroup}", null, arm64Users) +// +// // Set up a per-push trigger +// Utilities.addGithubPushTrigger(newJob) +// } +//} // Make the call to generate the help job Utilities.createHelperJob(this, project, branch, From dc1240d663a2b0ec7b8b2d21962d885afc8de82e Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Wed, 17 May 2017 10:16:50 -0700 Subject: [PATCH 038/198] Fix permissions for sh scripts that got messed up on merge --- tools-local/scripts/arm32_ci_script.sh | 0 tools-local/scripts/common/_common.sh | 0 tools-local/scripts/common/_prettyprint.sh | 0 tools-local/scripts/dockerrun.sh | 0 tools-local/setuptools/dotnet-deb-tool/tool/package_tool | 0 .../setuptools/dotnet-deb-tool/tool/scripts/debian_build_lib.sh | 0 tools-local/setuptools/dotnet-deb-tool/tool/setup/build_setup.sh | 0 tools-local/setuptools/dotnet-deb-tool/tool/setup/test_setup.sh | 0 tools-local/setuptools/dotnet-deb-tool/tool/test.sh | 0 .../package_root/path_relative_to_package_root/test_exe.sh | 0 .../test_assets/test_package_layout/package_root/test_called.sh | 0 11 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tools-local/scripts/arm32_ci_script.sh mode change 100644 => 100755 tools-local/scripts/common/_common.sh mode change 100644 => 100755 tools-local/scripts/common/_prettyprint.sh mode change 100644 => 100755 tools-local/scripts/dockerrun.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/package_tool mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/scripts/debian_build_lib.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/setup/build_setup.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/setup/test_setup.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/test.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh mode change 100644 => 100755 tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/test_called.sh diff --git a/tools-local/scripts/arm32_ci_script.sh b/tools-local/scripts/arm32_ci_script.sh old mode 100644 new mode 100755 diff --git a/tools-local/scripts/common/_common.sh b/tools-local/scripts/common/_common.sh old mode 100644 new mode 100755 diff --git a/tools-local/scripts/common/_prettyprint.sh b/tools-local/scripts/common/_prettyprint.sh old mode 100644 new mode 100755 diff --git a/tools-local/scripts/dockerrun.sh b/tools-local/scripts/dockerrun.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/package_tool b/tools-local/setuptools/dotnet-deb-tool/tool/package_tool old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/scripts/debian_build_lib.sh b/tools-local/setuptools/dotnet-deb-tool/tool/scripts/debian_build_lib.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/setup/build_setup.sh b/tools-local/setuptools/dotnet-deb-tool/tool/setup/build_setup.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/setup/test_setup.sh b/tools-local/setuptools/dotnet-deb-tool/tool/setup/test_setup.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/test.sh b/tools-local/setuptools/dotnet-deb-tool/tool/test.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh b/tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/path_relative_to_package_root/test_exe.sh old mode 100644 new mode 100755 diff --git a/tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/test_called.sh b/tools-local/setuptools/dotnet-deb-tool/tool/test/test_assets/test_package_layout/package_root/test_called.sh old mode 100644 new mode 100755 From 5e2d39d3af7349ad29a9b7e448e9f0ef856e1cd8 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Wed, 17 May 2017 11:38:47 -0700 Subject: [PATCH 039/198] Fix merge issue in packaging that caused duplicate package assets --- src/pkg/projects/dir.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/pkg/projects/dir.props b/src/pkg/projects/dir.props index a0ee621b..139a6cb6 100644 --- a/src/pkg/projects/dir.props +++ b/src/pkg/projects/dir.props @@ -75,10 +75,6 @@ - - true - - true From 4e56401bfb3d010bd74e06a201afab36ba3eb90c Mon Sep 17 00:00:00 2001 From: Jiyoung Giuliana Yun Date: Fri, 19 May 2017 01:07:34 +0900 Subject: [PATCH 040/198] Do not add MSTestResults in armel build (#2433) Fixed Tizen armel Release CI failure issue --- netci.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netci.groovy b/netci.groovy index c7e20c89..2f631258 100644 --- a/netci.groovy +++ b/netci.groovy @@ -93,7 +93,7 @@ platformList.each { platform -> Utilities.setMachineAffinity(newJob, os, version) Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - if (!(architecture == 'arm')) { + if (!(architecture == 'arm' || architecture == 'armel') ) { Utilities.addMSTestResults(newJob, '**/*-testResults.trx') } From 4c24d883cd6009fe006fd38586c059492b068e2c Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 18 May 2017 20:50:23 -0500 Subject: [PATCH 041/198] Update channel and branch for release/2.0.0 --- dir.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir.props b/dir.props index b3c18d14..6b7cb5d9 100644 --- a/dir.props +++ b/dir.props @@ -13,8 +13,8 @@ preview2 $(PreReleaseLabel) Preview 2 - master - master + release/2.0.0 + release/2.0.0 From 2d00df894e67a32194b19786559a4d0a2ca2427e Mon Sep 17 00:00:00 2001 From: John Beisner Date: Mon, 15 May 2017 13:15:32 -0700 Subject: [PATCH 042/198] If user specifies a CLI version in the global.json, honor it - error out if not found. And search the multilevel sdk lookup to find that specified version. Addresses: https://github.com/dotnet/core-setup/issues/2334 https://github.com/dotnet/core-setup/issues/2336 --- run.cmd | 2 +- src/corehost/cli/fxr/fx_muxer.cpp | 14 ++++++- .../GivenThatICareAboutMultilevelSDKLookup.cs | 40 ++++++++++++++----- 3 files changed, 43 insertions(+), 13 deletions(-) diff --git a/run.cmd b/run.cmd index 03abcc80..2f52e07d 100644 --- a/run.cmd +++ b/run.cmd @@ -7,7 +7,7 @@ if not defined VisualStudioVersion ( goto :Run ) echo Error: Visual Studio 2015 required. - echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/building/windows-instructions.md for build instructions. + echo Please see https://github.com/dotnet/core-setup/blob/master/Documentation/building/windows-instructions.md for build instructions. exit /b 1 ) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index fc850328..e1920f33 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -660,20 +660,26 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } pal::string_t retval; + bool cli_version_specified = false; + bool cli_version_found = false; + pal::string_t cli_version; + for (pal::string_t dir : hive_dir) { trace::verbose(_X("Searching SDK directory in [%s]"), dir.c_str()); if (!global.empty()) { - pal::string_t cli_version = resolve_cli_version(global); + cli_version = resolve_cli_version(global); if (!cli_version.empty()) { + cli_version_specified = true; pal::string_t sdk_path = dir; append_path(&sdk_path, _X("sdk")); append_path(&sdk_path, cli_version.c_str()); if (pal::directory_exists(sdk_path)) { + cli_version_found = true; trace::verbose(_X("CLI directory [%s] from global.json exists"), sdk_path.c_str()); retval = sdk_path; } @@ -683,7 +689,7 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } } } - if (retval.empty()) + if (retval.empty() && !cli_version_specified) { pal::string_t sdk_path = dir; append_path(&sdk_path, _X("sdk")); @@ -698,6 +704,10 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } trace::verbose(_X("It was not possible to find any SDK version")); + if (cli_version_specified && !cli_version_found) + { + trace::error(_X("The specified SDK version [%s] from global.json [%s] doesn't exist; install specified SDK version [%s]"), cli_version.c_str(), global.c_str(), cli_version.c_str()); + } return false; } diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 3c1af85e..0e91f24c 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -169,7 +169,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup } [Fact] - public void SdkLookup_Must_Look_For_Available_Versions_Before_Looking_Into_Another_Folder() + public void SdkLookup_Global_Json_Versioned_Behaviors() { var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -187,7 +187,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // CWD: empty // User: 9999.0.0, 9999.0.0-dummy // Exe: 9999.0.0-dummy - // Expected: 9999.0.0 from user dir + // Expected: no compatible version and specific error message dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -196,19 +196,18 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .CaptureStdErr() .Execute() .Should() - .Pass() + .Fail() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining("global.json] doesn't exist; install specified SDK version [9999.0.0-global-dummy]"); - // Add some dummy versions - AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0"); + // Add specified CLI version AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-global-dummy"); // Specified CLI version: 9999.0.0-global-dummy - // CWD: 9999.0.0 --> should not be picked + // CWD: empty // User: 9999.0.0, 9999.0.0-dummy // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy - // Expected: 9999.0.0 from user dir + // Expected: 9999.0.0-global-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -219,10 +218,31 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); + + // Add more specified CLI versions + AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0-global-dummy"); + AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-global-dummy"); + + // Specified CLI version: 9999.0.0-global-dummy + // CWD: 9999.0.0-global-dummy --> should not be picked + // User: 9999.0.0, 9999.0.0-dummy; 9999.0.0-global-dummy + // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy + // Expected: 9999.0.0-global-dummy from user dir + dotnet.Exec("help") + .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) + .Environment(s_DefaultEnvironment) + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); // Remove dummy folders from user dir - DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0", "9999.0.0-dummy"); + DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0", "9999.0.0-dummy", "9999.0.0-global-dummy"); } [Fact] From 6b177dd7ce84d7c4bb2a31f2319908b2fcb914e6 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 16 May 2017 09:49:31 -0700 Subject: [PATCH 043/198] Changes per code review... --- src/corehost/cli/fxr/fx_muxer.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index e1920f33..f6e0a5eb 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -661,8 +661,8 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal pal::string_t retval; bool cli_version_specified = false; - bool cli_version_found = false; - pal::string_t cli_version; + bool cli_version_found = false; + pal::string_t cli_version; for (pal::string_t dir : hive_dir) { @@ -672,14 +672,14 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal cli_version = resolve_cli_version(global); if (!cli_version.empty()) { - cli_version_specified = true; + cli_version_specified = true; pal::string_t sdk_path = dir; append_path(&sdk_path, _X("sdk")); append_path(&sdk_path, cli_version.c_str()); if (pal::directory_exists(sdk_path)) { - cli_version_found = true; + cli_version_found = true; trace::verbose(_X("CLI directory [%s] from global.json exists"), sdk_path.c_str()); retval = sdk_path; } @@ -703,11 +703,14 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } } - trace::verbose(_X("It was not possible to find any SDK version")); - if (cli_version_specified && !cli_version_found) - { - trace::error(_X("The specified SDK version [%s] from global.json [%s] doesn't exist; install specified SDK version [%s]"), cli_version.c_str(), global.c_str(), cli_version.c_str()); - } + if (cli_version_specified) + { + trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); + } + else + { + trace::verbose(_X("It was not possible to find any SDK version")); + } return false; } From f7bba535cd55f8bcf464eddf5d0f5c9ea7802cff Mon Sep 17 00:00:00 2001 From: John Beisner Date: Tue, 16 May 2017 10:30:59 -0700 Subject: [PATCH 044/198] Minor code refactoring; fixed a test... --- src/corehost/cli/fxr/fx_muxer.cpp | 16 +++++++--------- .../GivenThatICareAboutMultilevelSDKLookup.cs | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index f6e0a5eb..4bea9107 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -589,10 +589,10 @@ pal::string_t resolve_sdk_version(pal::string_t sdk_path) trace::verbose(_X("Checking if resolved SDK dir [%s] exists"), sdk_path.c_str()); if (pal::directory_exists(sdk_path)) { - retval = sdk_path; + retval = max_ver_str; } - trace::verbose(_X("Resolved SDK dir is [%s]"), retval.c_str()); + trace::verbose(_X("Resolved SDK dir is [%s]"), sdk_path.c_str()); return retval; } @@ -661,25 +661,23 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal pal::string_t retval; bool cli_version_specified = false; - bool cli_version_found = false; pal::string_t cli_version; for (pal::string_t dir : hive_dir) { trace::verbose(_X("Searching SDK directory in [%s]"), dir.c_str()); + pal::string_t sdk_path = dir; + append_path(&sdk_path, _X("sdk")); if (!global.empty()) { cli_version = resolve_cli_version(global); if (!cli_version.empty()) { cli_version_specified = true; - pal::string_t sdk_path = dir; - append_path(&sdk_path, _X("sdk")); append_path(&sdk_path, cli_version.c_str()); if (pal::directory_exists(sdk_path)) { - cli_version_found = true; trace::verbose(_X("CLI directory [%s] from global.json exists"), sdk_path.c_str()); retval = sdk_path; } @@ -691,9 +689,9 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } if (retval.empty() && !cli_version_specified) { - pal::string_t sdk_path = dir; - append_path(&sdk_path, _X("sdk")); - retval = resolve_sdk_version(sdk_path); + cli_version = resolve_sdk_version(sdk_path); + append_path(&sdk_path, cli_version.c_str()); + retval = sdk_path; } if (!retval.empty()) { diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 0e91f24c..306883b2 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -198,7 +198,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Fail() .And - .HaveStdErrContaining("global.json] doesn't exist; install specified SDK version [9999.0.0-global-dummy]"); + .HaveStdErrContaining("global.json] not found; install specified SDK version"); // Add specified CLI version AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-global-dummy"); From 99f2901076ada8b5bbbd99eda4979eadb2bba0b2 Mon Sep 17 00:00:00 2001 From: John Beisner Date: Wed, 17 May 2017 11:30:58 -0700 Subject: [PATCH 045/198] Fixing the minor code refactoring from ff4abe13 --- src/corehost/cli/fxr/fx_muxer.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 4bea9107..78980e19 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -659,9 +659,10 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal hive_dir.push_back(global_dir); } - pal::string_t retval; bool cli_version_specified = false; pal::string_t cli_version; + pal::string_t probing_cli_version; + pal::string_t probing_sdk_path; for (pal::string_t dir : hive_dir) { @@ -670,32 +671,32 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal append_path(&sdk_path, _X("sdk")); if (!global.empty()) { - cli_version = resolve_cli_version(global); - if (!cli_version.empty()) + probing_cli_version = resolve_cli_version(global); + if (!probing_cli_version.empty()) { cli_version_specified = true; - append_path(&sdk_path, cli_version.c_str()); + probing_sdk_path = sdk_path; + append_path(&probing_sdk_path, probing_cli_version.c_str()); - if (pal::directory_exists(sdk_path)) + if (pal::directory_exists(probing_sdk_path)) { - trace::verbose(_X("CLI directory [%s] from global.json exists"), sdk_path.c_str()); - retval = sdk_path; + trace::verbose(_X("CLI directory [%s] from global.json exists"), probing_sdk_path.c_str()); + cli_version = probing_cli_version; } else { - trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), sdk_path.c_str()); + trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), probing_sdk_path.c_str()); } } } - if (retval.empty() && !cli_version_specified) + if (cli_version.empty() && !cli_version_specified) { cli_version = resolve_sdk_version(sdk_path); - append_path(&sdk_path, cli_version.c_str()); - retval = sdk_path; } - if (!retval.empty()) + if (!cli_version.empty()) { - cli_sdk->assign(retval); + append_path(&sdk_path, cli_version.c_str()); + cli_sdk->assign(sdk_path); trace::verbose(_X("Found CLI SDK in: %s"), cli_sdk->c_str()); return true; } @@ -705,7 +706,7 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal { trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); } - else + else { trace::verbose(_X("It was not possible to find any SDK version")); } From 2e68a683c1077a826c969cd52344f474e8e5856c Mon Sep 17 00:00:00 2001 From: John Beisner Date: Thu, 18 May 2017 14:21:37 -0700 Subject: [PATCH 046/198] Enabling SDK mutilevel lookup to pick the highest semantical version out of all viable directories in the search stack. --- src/corehost/cli/fxr/fx_muxer.cpp | 98 ++++++++++++------- .../GivenThatICareAboutMultilevelSDKLookup.cs | 48 ++++----- 2 files changed, 91 insertions(+), 55 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 78980e19..441e6931 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -563,7 +563,7 @@ pal::string_t fx_muxer_t::resolve_cli_version(const pal::string_t& global_json) return retval; } -pal::string_t resolve_sdk_version(pal::string_t sdk_path) +pal::string_t resolve_sdk_version(pal::string_t sdk_path, bool parse_only_production) { trace::verbose(_X("--- Resolving SDK version from SDK dir [%s]"), sdk_path.c_str()); @@ -577,7 +577,7 @@ pal::string_t resolve_sdk_version(pal::string_t sdk_path) trace::verbose(_X("Considering version... [%s]"), version.c_str()); fx_ver_t ver(-1, -1, -1); - if (fx_ver_t::parse(version, &ver, false)) // false -- implies both production and prerelease. + if (fx_ver_t::parse(version, &ver, parse_only_production)) { max_ver = std::max(ver, max_ver); } @@ -589,10 +589,10 @@ pal::string_t resolve_sdk_version(pal::string_t sdk_path) trace::verbose(_X("Checking if resolved SDK dir [%s] exists"), sdk_path.c_str()); if (pal::directory_exists(sdk_path)) { + trace::verbose(_X("Resolved SDK dir is [%s]"), sdk_path.c_str()); retval = max_ver_str; } - trace::verbose(_X("Resolved SDK dir is [%s]"), sdk_path.c_str()); return retval; } @@ -609,6 +609,24 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::stri return resolve_sdk_dotnet_path(own_dir, cwd, cli_sdk); } +bool higher_sdk_version(const pal::string_t& new_version, pal::string_t* version, bool parse_only_production) +{ + bool retval = false; + fx_ver_t ver(-1, -1, -1); + fx_ver_t new_ver(-1, -1, -1); + + if (fx_ver_t::parse(new_version, &new_ver, parse_only_production)) + { + if (!fx_ver_t::parse(*version, &ver, parse_only_production) || (new_ver > ver)) + { + version->assign(new_version); + retval = true; + } + } + + return retval; +} + bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal::string_t& cwd, pal::string_t* cli_sdk) { pal::string_t global; @@ -661,47 +679,61 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal bool cli_version_specified = false; pal::string_t cli_version; - pal::string_t probing_cli_version; - pal::string_t probing_sdk_path; + pal::string_t sdk_path; + pal::string_t global_cli_version; + + if (!global.empty()) + { + global_cli_version = resolve_cli_version(global); + if (!global_cli_version.empty()) + { + cli_version_specified = true; + } + } for (pal::string_t dir : hive_dir) { trace::verbose(_X("Searching SDK directory in [%s]"), dir.c_str()); - pal::string_t sdk_path = dir; - append_path(&sdk_path, _X("sdk")); - if (!global.empty()) - { - probing_cli_version = resolve_cli_version(global); - if (!probing_cli_version.empty()) - { - cli_version_specified = true; - probing_sdk_path = sdk_path; - append_path(&probing_sdk_path, probing_cli_version.c_str()); + pal::string_t current_sdk_path = dir; + append_path(¤t_sdk_path, _X("sdk")); - if (pal::directory_exists(probing_sdk_path)) - { - trace::verbose(_X("CLI directory [%s] from global.json exists"), probing_sdk_path.c_str()); - cli_version = probing_cli_version; - } - else - { - trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), probing_sdk_path.c_str()); - } + if (cli_version_specified) + { + pal::string_t probing_sdk_path = current_sdk_path; + append_path(&probing_sdk_path, global_cli_version.c_str()); + + if (pal::directory_exists(probing_sdk_path)) + { + trace::verbose(_X("CLI directory [%s] from global.json exists"), probing_sdk_path.c_str()); + cli_version = global_cli_version; + sdk_path = current_sdk_path; + // Use the first matching version + break; + } + else + { + trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), probing_sdk_path.c_str()); } } - if (cli_version.empty() && !cli_version_specified) + else { - cli_version = resolve_sdk_version(sdk_path); - } - if (!cli_version.empty()) - { - append_path(&sdk_path, cli_version.c_str()); - cli_sdk->assign(sdk_path); - trace::verbose(_X("Found CLI SDK in: %s"), cli_sdk->c_str()); - return true; + bool parse_only_production = false; // false -- implies both production and prerelease. + pal::string_t new_cli_version = resolve_sdk_version(current_sdk_path, parse_only_production); + if (higher_sdk_version(new_cli_version, &cli_version, parse_only_production)) + { + sdk_path = current_sdk_path; + } } } + if (!cli_version.empty()) + { + append_path(&sdk_path, cli_version.c_str()); + cli_sdk->assign(sdk_path); + trace::verbose(_X("Found CLI SDK in: %s"), cli_sdk->c_str()); + return true; + } + if (cli_version_specified) { trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 306883b2..8eb200f3 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -253,14 +253,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup var dotnet = fixture.BuiltDotnet; - // Add a dummy version in the exe dir + // Add dummy versions in the exe dir AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0"); + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.1-dummy"); // Specified CLI version: none // CWD: empty // User: empty - // Exe: 9999.0.0 - // Expected: 9999.0.0 from exe dir + // Exe: 9999.0.0, 9999.0.1-dummy + // Expected: 9999.0.1-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -271,7 +272,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1-dummy", _dotnetSdkDllMessageTerminator)); // Add a dummy version in the exe dir AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.1"); @@ -279,7 +280,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Specified CLI version: none // CWD: empty // User: empty - // Exe: 9999.0.0, 9999.0.1 + // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1 // Expected: 9999.0.1 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) @@ -293,14 +294,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .And .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); - // Add a dummy version in the exe dir - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-dummy"); + // Add dummy versions + AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.1"); + AddAvailableSdkVersions(_cwdSdkBaseDir, "10000.0.0"); // Specified CLI version: none - // CWD: empty - // User: empty - // Exe: 9999.0.0, 9999.0.1, 9999.0.0-dummy - // Expected: 9999.0.1 from exe dir + // CWD: 10000.0.0 --> should not be picked + // User: 9999.0.1 + // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1 + // Expected: 9999.0.1 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -311,15 +313,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); // Add a dummy version in the exe dir AddAvailableSdkVersions(_exeSdkBaseDir, "10000.0.0-dummy"); // Specified CLI version: none - // CWD: empty - // User: empty - // Exe: 9999.0.0, 9999.0.1, 9999.0.0-dummy, 10000.0.0-dummy + // CWD: 10000.0.0 --> should not be picked + // User: 9999.0.1 + // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1, 10000.0.0-dummy // Expected: 10000.0.0-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) @@ -333,14 +335,14 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .And .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "10000.0.0-dummy", _dotnetSdkDllMessageTerminator)); - // Add a dummy version in the exe dir - AddAvailableSdkVersions(_exeSdkBaseDir, "10000.0.0"); + // Add a dummy version in the user dir + AddAvailableSdkVersions(_userSdkBaseDir, "10000.0.0"); // Specified CLI version: none - // CWD: empty - // User: empty - // Exe: 9999.0.0, 9999.0.1, 9999.0.0-dummy, 10000.0.0-dummy, 10000.0.0 - // Expected: 10000.0.0 from exe dir + // CWD: 10000.0.0 --> should not be picked + // User: 9999.0.1, 10000.0.0 + // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1, 10000.0.0-dummy + // Expected: 10000.0.0 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -351,8 +353,10 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "10000.0.0", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "10000.0.0", _dotnetSdkDllMessageTerminator)); + // Remove dummy folders from user dir + DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "10000.0.0"); } // This method adds a list of new sdk version folders in the specified From 073d8ccdd84f5d518eca261af9091e2e8eb41dce Mon Sep 17 00:00:00 2001 From: John Beisner Date: Fri, 19 May 2017 08:53:37 -0700 Subject: [PATCH 047/198] Changes per code review... --- src/corehost/cli/fxr/fx_muxer.cpp | 37 +++++++++++++------------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 441e6931..806ed918 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -677,7 +677,6 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal hive_dir.push_back(global_dir); } - bool cli_version_specified = false; pal::string_t cli_version; pal::string_t sdk_path; pal::string_t global_cli_version; @@ -685,10 +684,6 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal if (!global.empty()) { global_cli_version = resolve_cli_version(global); - if (!global_cli_version.empty()) - { - cli_version_specified = true; - } } for (pal::string_t dir : hive_dir) @@ -697,7 +692,16 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal pal::string_t current_sdk_path = dir; append_path(¤t_sdk_path, _X("sdk")); - if (cli_version_specified) + if (global_cli_version.empty()) + { + bool parse_only_production = false; // false -- implies both production and prerelease. + pal::string_t new_cli_version = resolve_sdk_version(current_sdk_path, parse_only_production); + if (higher_sdk_version(new_cli_version, &cli_version, parse_only_production)) + { + sdk_path = current_sdk_path; + } + } + else { pal::string_t probing_sdk_path = current_sdk_path; append_path(&probing_sdk_path, global_cli_version.c_str()); @@ -715,17 +719,8 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), probing_sdk_path.c_str()); } } - else - { - bool parse_only_production = false; // false -- implies both production and prerelease. - pal::string_t new_cli_version = resolve_sdk_version(current_sdk_path, parse_only_production); - if (higher_sdk_version(new_cli_version, &cli_version, parse_only_production)) - { - sdk_path = current_sdk_path; - } - } } - + if (!cli_version.empty()) { append_path(&sdk_path, cli_version.c_str()); @@ -734,14 +729,14 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal return true; } - if (cli_version_specified) - { - trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); - } - else + if (global_cli_version.empty()) { trace::verbose(_X("It was not possible to find any SDK version")); } + else + { + trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); + } return false; } From d722d5986d6040f600f2bf831d892f9e3426d8b6 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 19 May 2017 17:05:57 -0500 Subject: [PATCH 048/198] Fix update dotnet/versions repo to update the correct path PB_Branch isn't a variable that flows through pipe-build. Need to use SourceBranch instead. --- buildpipeline/Core-Setup-Publish.json | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/buildpipeline/Core-Setup-Publish.json b/buildpipeline/Core-Setup-Publish.json index 2ad1b60a..26017418 100644 --- a/buildpipeline/Core-Setup-Publish.json +++ b/buildpipeline/Core-Setup-Publish.json @@ -117,7 +117,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(PB_Branch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -258,7 +258,7 @@ "value": "$(Build.SourcesDirectory)\\core-setup" }, "PB_VsoRepoUrl": { - "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" + "value": "--branch $(SourceBranch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" }, "PB_AzureAccountName": { "value": "dotnetcli" @@ -274,9 +274,6 @@ "value": null, "isSecret": true }, - "PB_Branch": { - "value": "master" - }, "SourceVersion": { "value": "HEAD" }, @@ -378,4 +375,4 @@ "state": "wellFormed", "revision": 418097676 } -} \ No newline at end of file +} From a24212bc5832fe883eb05a1627a63fa1bcd3276c Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Mon, 22 May 2017 11:03:01 -0700 Subject: [PATCH 049/198] Finalize checksums Fix Finalization of UniversalWindowsPlatform packages Add checksum parameters to publish --- buildpipeline/Core-Setup-Publish.json | 9 ++++++++- dir.props | 3 +++ publish/publish.proj | 18 ++++++++++++++++++ ...ft.NETCore.UniversalWindowsPlatform.pkgproj | 2 +- tools-local/tasks/FinalizeBuild.cs | 5 ++++- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/buildpipeline/Core-Setup-Publish.json b/buildpipeline/Core-Setup-Publish.json index 26017418..0727b5c3 100644 --- a/buildpipeline/Core-Setup-Publish.json +++ b/buildpipeline/Core-Setup-Publish.json @@ -117,7 +117,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -267,6 +267,13 @@ "value": null, "isSecret": true }, + "PB_ChecksumAzureAccountName": { + "value": "dotnetclichecksums" + }, + "PB_ChecksumAzureAccessToken": { + "value": null, + "isSecret": true + }, "PB_VsoAccountName": { "value": "dn-bot" }, diff --git a/dir.props b/dir.props index 6b7cb5d9..3a79abc7 100644 --- a/dir.props +++ b/dir.props @@ -74,6 +74,9 @@ $(ProductVersion) + 5.4.0 + $(UWPCoreRuntimeSdkVersion)$(ProductVersionSuffix) + $(SharedFrameworkNugetVersion) - 703d40525af4a09f5566cd3d8f334b3736b68fae - fcd99ed86a703a16698fcd0027707739c8ef3501 - cddd078e3efc27b2fc23c38d8028e3b647cd4fe3 - cddd078e3efc27b2fc23c38d8028e3b647cd4fe3 + 08ad835fac10ec04e5302ab59fda6cacdde98a60 + 08ad835fac10ec04e5302ab59fda6cacdde98a60 + 08ad835fac10ec04e5302ab59fda6cacdde98a60 + 08ad835fac10ec04e5302ab59fda6cacdde98a60 - 4.4.0-preview2-25316-01 - 2.0.0-preview2-25316-01 - 2.0.0-preview2-25316-03 + 4.4.0-preview2-25322-03 + 2.0.0-preview2-25322-03 + 2.0.0-preview2-25322-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25316-01 + 2.0.0-preview2-25322-01 1.4.1 - 4.4.0-preview2-25316-01 + 4.4.0-preview2-25322-02 build-info/dotnet/ - master + release/2.0.0 $(MSBuildThisFileFullPath) From ba93dd3287f74606802c3e9516361cc46fba742c Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Mon, 22 May 2017 14:30:40 -0700 Subject: [PATCH 051/198] Pick up debian packages from new format --- publish/dir.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/dir.targets b/publish/dir.targets index 73c9b908..c605f2fa 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -89,7 +89,7 @@ UploadJsonFilename="%(DebInstallerFile.UploadJsonFilename)" PackageName="%(DebInstallerFile.PackageName)" PackageVersion="$(SharedFrameworkNugetVersion)" - UploadUrl="$(BaseUrl)$(ContainerName)/$(Channel)/Installers/$(SharedFrameworkNugetVersion)/%(DebInstallerFile.Filename)%(DebInstallerFile.Extension)" /> + UploadUrl="$(BaseUrl)$(ContainerName)/Runtime/$(SharedFrameworkNugetVersion)/%(DebInstallerFile.Filename)%(DebInstallerFile.Extension)" /> From 58e8d097e513ba1e303d59828d1701f99dd6bf4c Mon Sep 17 00:00:00 2001 From: chcosta Date: Mon, 22 May 2017 15:29:52 -0700 Subject: [PATCH 052/198] Ask Mode: Xplat symbol stripping (#2476) * Strip xplat symbols and repackage (#2430) * Staging xplay sym stripping * Symbols are being stripped, need to package them * Package xplat symbols * Add _.pdb placeholder * Strip symbols for apphost and dotnet * Use tools version of pdb placeholder * Strip xplat symbols and repackage * Update official builds * Add EOF newlines * Remove debug message * Move cmakeoutput path properties * Add symbol stripping to ci release x64 unix builds (#2436) * Add symbol stripping to ci release unix builds * Exclude armel from symstrip * Only strip symbols on x64 * switch back to enabling arm builds, they should be strippable * Enable symstrip for arm --- buildpipeline/pipeline.json | 6 +- config.json | 12 ++ netci.groovy | 20 ++- src/corehost/CMakeLists.txt | 124 ++++++++++++++++++ src/corehost/build.proj | 15 ++- src/corehost/build.sh | 7 +- src/corehost/cli/dll/CMakeLists.txt | 1 + src/corehost/cli/exe/apphost/CMakeLists.txt | 2 + src/corehost/cli/exe/dotnet/CMakeLists.txt | 2 + src/corehost/cli/fxr/CMakeLists.txt | 2 +- src/dir.props | 6 +- ...s_NT.Microsoft.NETCore.DotNetAppHost.props | 3 - ...dows_NT.Microsoft.NETCore.DotNetHost.props | 3 - ...T.Microsoft.NETCore.DotNetHostPolicy.props | 3 - ...Microsoft.NETCore.DotNetHostResolver.props | 3 - src/pkg/projects/dir.targets | 37 ++++++ 16 files changed, 217 insertions(+), 29 deletions(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 5b40fe39..21bca77f 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -20,7 +20,7 @@ "Parameters": { "PB_DistroRid": "rhel.7.2-x64", "PB_DockerTag": "rhel7_prereqs_2", - "PB_AdditionalBuildArguments":"-PortableBuild=true", + "PB_AdditionalBuildArguments":"-PortableBuild=true -strip-symbols", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -36,7 +36,7 @@ "PB_DistroRid": "ubuntu.14.04-arm", "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239", "PB_TargetArchitecture": "arm", - "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true", + "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols", "PB_CrossBuildArgs": "-e ROOTFS_DIR ", "PB_PortableBuild": "true" }, @@ -50,7 +50,7 @@ { "Name": "Core-Setup-OSX-BT", "Parameters": { - "PB_PortableBuildArg": "-PortableBuild=true", + "PB_PortableBuildArg": "-PortableBuild=true -strip-symbols", "PB_PortableBuild": "true" }, "ReportingParameters": { diff --git a/config.json b/config.json index 28ea6a0c..a77c8f1e 100644 --- a/config.json +++ b/config.json @@ -72,6 +72,12 @@ "values": [], "defaultValue": "/flp:v=normal" }, + "StripSymbols": { + "description": "Pass additional argument to native build to configure symbol stripping.", + "valueType": "property", + "values": ["true", "false"], + "defaultValue": false + }, "Project": { "description": "Project where the commands are going to be applied.", "valueType": "passThrough", @@ -250,6 +256,12 @@ "settings": { "DisableCrossgen": "true" } + }, + "strip-symbols": { + "description": "Strip native symbols.", + "settings": { + "StripSymbols": true + } } }, "defaultValues":{ diff --git a/netci.groovy b/netci.groovy index 2f631258..0e0e1034 100644 --- a/netci.groovy +++ b/netci.groovy @@ -30,10 +30,15 @@ platformList.each { platform -> def dockerWorkingDirectory = "/src/core-setup" def dockerCommand = '' def crossbuildargs = '' + def buildArgs = "-ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + + if (os != 'Windows_NT' && configuration == 'Release') { + buildArgs += " -strip-symbols" + } // Calculate build command if (os == 'Windows_NT') { - buildCommand = ".\\build.cmd -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + buildCommand = ".\\build.cmd ${buildArgs}" if ((architecture == 'arm' || architecture == 'arm64')) { buildCommand += " -PortableBuild=true -SkipTests=true" } @@ -43,7 +48,8 @@ platformList.each { platform -> dockerContainer = "ubuntu1404_cross_prereqs_v4-tizen_rootfs" dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture}.tizen.build --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" + buildArgs += " -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" + buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" } else if ((os.startsWith("Ubuntu")) && (architecture == 'arm' || architecture == 'armel')) { @@ -56,16 +62,18 @@ platformList.each { platform -> dockerContainer = "ubuntu-16.04-cross-ef0ac75-20175511035548" } dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -PortableBuild=true -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true${crossbuildargs}" + buildArgs += " -PortableBuild=true -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true${crossbuildargs}" + buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" } else if (os == "Ubuntu") { dockerContainer = "ubuntu-14.04-debpkg-e5cf912-20175003025046" dockerCommand = "docker run --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildCommand = "${dockerCommand} ./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" } else if (os == "PortableLinux") { // Jenkins non-Ubuntu CI machines don't have docker - buildCommand = "./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture} -PortableBuild=true" + buildArgs += " -PortableBuild=true" + buildCommand = "./build.sh ${buildArgs}" // Trigger a portable Linux build that runs on RHEL7.2 osForGHTrigger = "PortableLinux" @@ -73,7 +81,7 @@ platformList.each { platform -> } else { // Jenkins non-Ubuntu CI machines don't have docker - buildCommand = "./build.sh -ConfigurationGroup=${configuration} -TargetArchitecture=${architecture}" + buildCommand = "./build.sh ${buildArgs}" } def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { diff --git a/src/corehost/CMakeLists.txt b/src/corehost/CMakeLists.txt index 0a76ce4f..456aa04a 100644 --- a/src/corehost/CMakeLists.txt +++ b/src/corehost/CMakeLists.txt @@ -1,2 +1,126 @@ cmake_minimum_required (VERSION 2.6) + +if(CMAKE_SYSTEM_NAME STREQUAL Linux) + set(CLR_CMAKE_PLATFORM_UNIX 1) + message("System name Linux") +endif(CMAKE_SYSTEM_NAME STREQUAL Linux) + +if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(CLR_CMAKE_PLATFORM_UNIX 1) + message("System name Darwin") +endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) + +if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + set(CLR_CMAKE_PLATFORM_UNIX 1) + add_definitions(-D_BSD_SOURCE) # required for getline + message("System name FreeBSD") +endif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + +if(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) + set(CLR_CMAKE_PLATFORM_UNIX 1) + message("System name OpenBSD") +endif(CMAKE_SYSTEM_NAME STREQUAL OpenBSD) + +if(CMAKE_SYSTEM_NAME STREQUAL NetBSD) + set(CLR_CMAKE_PLATFORM_UNIX 1) + message("System name NetBSD") +endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD) + +if(CMAKE_SYSTEM_NAME STREQUAL SunOS) + set(CLR_CMAKE_PLATFORM_UNIX 1) + message("System name SunOS") +endif(CMAKE_SYSTEM_NAME STREQUAL SunOS) + +if (NOT WIN32) + if (CMAKE_SYSTEM_NAME STREQUAL Darwin) + # Ensure that dsymutil and strip are present + find_program(DSYMUTIL dsymutil) + if (DSYMUTIL STREQUAL "DSYMUTIL-NOTFOUND") + message(FATAL_ERROR "dsymutil not found") + endif() + + find_program(STRIP strip) + if (STRIP STREQUAL "STRIP-NOTFOUND") + message(FATAL_ERROR "strip not found") + endif() + else (CMAKE_SYSTEM_NAME STREQUAL Darwin) + # Ensure that objcopy is present + if(DEFINED ENV{ROOTFS_DIR}) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686) + find_program(OBJCOPY ${TOOLCHAIN}-objcopy) + else() + message(FATAL_ERROR "Only AMD64, X86, ARM64 and ARM are supported") + endif() + else() + find_program(OBJCOPY objcopy) + endif() + if (OBJCOPY STREQUAL "OBJCOPY-NOTFOUND" AND NOT CMAKE_SYSTEM_PROCESSOR STREQUAL i686) + message(FATAL_ERROR "objcopy not found") + endif() + endif (CMAKE_SYSTEM_NAME STREQUAL Darwin) +endif () + +function(strip_symbols targetName outputFilename) + if(CLR_CMAKE_PLATFORM_UNIX) + if(STRIP_SYMBOLS) + + # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE + # generator expression doesn't work correctly returning the wrong path and on + # the newer cmake versions the LOCATION property isn't supported anymore. + if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) + set(strip_source_file $) + else() + get_property(strip_source_file TARGET ${targetName} PROPERTY LOCATION) + endif() + + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(strip_destination_file ${strip_source_file}.dwarf) + + add_custom_command( + TARGET ${targetName} + POST_BUILD + VERBATIM + COMMAND ${DSYMUTIL} --flat --minimize ${strip_source_file} + COMMAND ${STRIP} -u -r ${strip_source_file} + COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} + ) + else(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(strip_destination_file ${strip_source_file}.dbg) + + add_custom_command( + TARGET ${targetName} + POST_BUILD + VERBATIM + COMMAND ${OBJCOPY} --only-keep-debug ${strip_source_file} ${strip_destination_file} + COMMAND ${OBJCOPY} --strip-unneeded ${strip_source_file} + COMMAND ${OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file} + COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} + ) + endif(CMAKE_SYSTEM_NAME STREQUAL Darwin) + + set(${outputFilename} ${strip_destination_file} PARENT_SCOPE) + endif(STRIP_SYMBOLS) + endif(CLR_CMAKE_PLATFORM_UNIX) +endfunction() + +function(install_library_and_symbols targetName) + strip_symbols(${targetName} strip_destination_file) + + # On the older version of cmake (2.8.12) used on Ubuntu 14.04 the TARGET_FILE + # generator expression doesn't work correctly returning the wrong path and on + # the newer cmake versions the LOCATION property isn't supported anymore. + if(CMAKE_VERSION VERSION_EQUAL 3.0 OR CMAKE_VERSION VERSION_GREATER 3.0) + set(install_source_file $) + else() + get_property(install_source_file TARGET ${targetName} PROPERTY LOCATION) + endif() + + install(PROGRAMS ${install_source_file} DESTINATION .) + if(WIN32) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/$/${targetName}.pdb DESTINATION PDB) + else() + install(FILES ${strip_destination_file} DESTINATION .) + endif() +endfunction() + add_subdirectory(cli) diff --git a/src/corehost/build.proj b/src/corehost/build.proj index bd20b95e..3d480e00 100644 --- a/src/corehost/build.proj +++ b/src/corehost/build.proj @@ -14,10 +14,14 @@ Condition="'$(OSGroup)' != 'Windows_NT'" DependsOnTargets="GetLatestCommitHash"> + $(IntermediateOutputRootPath)corehost\cmake\ + $(CMakeBuildDir)cli\fxr\$(DotnetHostFxrBaseName) + $(CMakeBuildDir)cli\dll\$(HostPolicyBaseName) + --arch $(TargetArchitecture) --apphostver $(AppHostVersion) --hostver $(HostVersion) --fxrver $(HostResolverVersion) --policyver $(HostPolicyVersion) --commithash $(LatestCommit) $(BuildArgs) -portable - $(IntermediateOutputRootPath)corehost\cmake\ - $(BuildArgs) --cross + $(BuildArgs) --cross + $(BuildArgs) --stripsymbols @@ -30,8 +34,11 @@ - - + + + + + lib + .so .dll .dylib - .so + .dbg + .dwarf + .pdb + $(LibPrefix)hostfxr$(LibSuffix) $(LibPrefix)hostpolicy$(LibSuffix) diff --git a/src/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props b/src/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props index 0e598ce8..29eb5dbb 100644 --- a/src/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props +++ b/src/pkg/projects/Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props @@ -2,9 +2,6 @@ - - true - runtimes/$(PackageTargetRuntime)/native diff --git a/src/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props b/src/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props index 3f97b80b..87ff19bf 100644 --- a/src/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props +++ b/src/pkg/projects/Microsoft.NETCore.DotNetHost/runtime.Windows_NT.Microsoft.NETCore.DotNetHost.props @@ -2,9 +2,6 @@ - - true - runtimes/$(PackageTargetRuntime)/native diff --git a/src/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props b/src/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props index 8f9e9b80..107a7fd6 100644 --- a/src/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props +++ b/src/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/runtime.Windows_NT.Microsoft.NETCore.DotNetHostPolicy.props @@ -2,9 +2,6 @@ - - true - runtimes/$(PackageTargetRuntime)/native diff --git a/src/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props b/src/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props index 580df8f3..10268f6f 100644 --- a/src/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props +++ b/src/pkg/projects/Microsoft.NETCore.DotNetHostResolver/runtime.Windows_NT.Microsoft.NETCore.DotNetHostResolver.props @@ -2,9 +2,6 @@ - - true - runtimes/$(PackageTargetRuntime)/native diff --git a/src/pkg/projects/dir.targets b/src/pkg/projects/dir.targets index 6055b03f..868e4b5e 100644 --- a/src/pkg/projects/dir.targets +++ b/src/pkg/projects/dir.targets @@ -6,6 +6,43 @@ true + + + + + + + + + + + + + + + + + true + + + + + true + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + From 9e11812a69d5f1493fd1115ab0789cad34978a9b Mon Sep 17 00:00:00 2001 From: chcosta Date: Mon, 22 May 2017 15:59:25 -0700 Subject: [PATCH 053/198] Create symbols packages, add serviceable attribute, and update assembly info (#2331) (#2479) * Include copyright info, serviceable attribute, and produce symbols packages for Microsoft.Extensions.DependencyModel and Microsoft.DotNet.PlatformAbstractions * Align AssemblyFileVersion with VersionPrefix, remove env vars from dotnet pack * Add license files * small tweak to packagepath * Add package licenseurl and projecturl --- BuildToolsVersion.txt | 2 +- src/managed/CommonManaged.props | 20 ++++++++++++++++++++ src/managed/dir.proj | 18 ++++++++++-------- src/pkg/packaging/dir.proj | 2 +- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index d58933b4..e079aa20 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01611-07 +2.0.0-prerelease-01616-04 diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index 4361fd16..b15a7f12 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -6,8 +6,15 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/ 2.0.0 + $(VersionPrefix) true true + true + true + https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT + https://dot.net + $(RepoRoot)LICENSE.TXT + $(RepoRoot)THIRD-PARTY-NOTICES.TXT @@ -26,4 +33,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/managed/dir.proj b/src/managed/dir.proj index ced354b0..69ec1759 100644 --- a/src/managed/dir.proj +++ b/src/managed/dir.proj @@ -3,19 +3,21 @@ - - - - - /p:Configuration=$(ConfigurationGroup) - + + - + + /p:Configuration=$(ConfigurationGroup) + $(BuildArgs) /p:LatestCommit=$(LatestCommit) + $(BuildArgs) /p:BuiltByString="$(BuiltByString)" + + + diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 1bcbc1ef..c78e4133 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -166,7 +166,7 @@ --version-suffix $(VersionSuffix) - From 88c58bf710265268264891dc96aea3a15b8035fc Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Tue, 23 May 2017 09:56:20 -0700 Subject: [PATCH 054/198] Fix casing of package name in generated deb json --- publish/dir.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/publish/dir.targets b/publish/dir.targets index 73c9b908..daeae482 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -74,10 +74,10 @@ dotnet-host - dotnet-hostfxr-$(HostResolverVersion) + dotnet-hostfxr-$(HostResolverVersion.ToLower()) - dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkNugetVersion) + dotnet-sharedframework-$(SharedFrameworkName.ToLower())-$(SharedFrameworkNugetVersion.ToLower()) From 35749847a0fa555e2c758da17f52b6eaef2164be Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 23 May 2017 18:30:15 -0500 Subject: [PATCH 055/198] AppBaseCompilationAssemblyResolver shouldn't throw. There are scenarios where a compilation assembly should be resolved from places outside of the appbase folder in a published app. We shouldn't throw early and let the other resolvers do their job. Fix #2496 --- .../AppBaseCompilationAssemblyResolver.cs | 15 ++++++--------- .../AppBaseResolverTests.cs | 12 +++++------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs index 244d6c2f..4500b422 100644 --- a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs +++ b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs @@ -84,6 +84,8 @@ namespace Microsoft.Extensions.DependencyModel.Resolution directories.Add(sharedDirectory); } + var paths = new List(); + foreach (var assembly in library.Assemblies) { bool resolved = false; @@ -93,7 +95,7 @@ namespace Microsoft.Extensions.DependencyModel.Resolution string fullName; if (ResolverUtils.TryResolveAssemblyFile(_fileSystem, directory, assemblyFile, out fullName)) { - assemblies.Add(fullName); + paths.Add(fullName); resolved = true; break; } @@ -101,17 +103,12 @@ namespace Microsoft.Extensions.DependencyModel.Resolution if (!resolved) { - // throw in case when we are published app and nothing found - // because we cannot rely on nuget package cache in this case - if (isPublished) - { - throw new InvalidOperationException( - $"Cannot find assembly file {assemblyFile} at '{string.Join(",", directories)}'"); - } return false; - } + } } + // only modify the assemblies parameter if we've resolved all files + assemblies?.AddRange(paths); return true; } } diff --git a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs index f9336276..0d3b8aa5 100644 --- a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs +++ b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs @@ -143,11 +143,8 @@ namespace Microsoft.Extensions.DependencyModel.Tests var resolver = CreateResolver(fileSystem); var assemblies = new List(); - var exception = Assert.Throws(() => resolver.TryResolveAssemblyPaths(library, assemblies)); - exception.Message.Should() - .Contain(BasePath) - .And.Contain(BasePathRefs) - .And.Contain(TestLibraryFactory.SecondAssembly); + resolver.TryResolveAssemblyPaths(library, assemblies).Should().Be(false); + assemblies.Should().BeEmpty(); } [Fact] @@ -328,7 +325,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests } [Fact] - public void ShouldThrowForNonResolvedInPublishedApps() + public void ShouldReturnFalseForNonResolvedInPublishedApps() { var fileSystem = FileSystemMockBuilder .Create() @@ -341,7 +338,8 @@ namespace Microsoft.Extensions.DependencyModel.Tests var resolver = CreateResolver(fileSystem); var assemblies = new List(); - Assert.Throws(() => resolver.TryResolveAssemblyPaths(library, assemblies)); + resolver.TryResolveAssemblyPaths(library, assemblies).Should().Be(false); + assemblies.Should().BeEmpty(); } [Fact] From 354a27609d11aca30e0e5dc277e93efcc03c26d1 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Thu, 18 May 2017 17:30:42 -0700 Subject: [PATCH 056/198] roll forward across hive --- .../design-docs/multilevel-sharedfx-lookup.md | 24 ++-- src/corehost/cli/args.cpp | 6 +- src/corehost/cli/args.h | 7 +- src/corehost/cli/deps_resolver.cpp | 9 +- src/corehost/cli/fxr/fx_muxer.cpp | 113 ++++++++++++------ src/corehost/cli/fxr/fx_muxer.h | 2 +- src/corehost/common/pal.h | 4 +- src/corehost/common/pal.unix.cpp | 30 +++-- src/corehost/common/pal.windows.cpp | 8 +- src/corehost/common/utils.cpp | 14 ++- src/corehost/common/utils.h | 2 +- 11 files changed, 135 insertions(+), 84 deletions(-) diff --git a/Documentation/design-docs/multilevel-sharedfx-lookup.md b/Documentation/design-docs/multilevel-sharedfx-lookup.md index 5eaac3ca..ce3483ae 100644 --- a/Documentation/design-docs/multilevel-sharedfx-lookup.md +++ b/Documentation/design-docs/multilevel-sharedfx-lookup.md @@ -80,14 +80,7 @@ At last, the coreclr is loaded into memory and called to run the application. ## Proposed changes -Almost every file search is done in relation to the executable directory. It would be better to be able to search for some files in other directories as well. Suggested folders are the user location and the global .NET location. The user and global folders may vary depending on the running operational system. They are defined as follows: - -User location: - - Windows 32-bit: %SystemDrive%\Users\username\.dotnet\x86 - Windows 64-bit: %SystemDrive%\Users\username\.dotnet\x64 - Unix 32-bit: /home/username/.dotnet/x86 - Unix 64-bit: /home/username/.dotnet/x64 +Almost every file search is done in relation to the executable directory. It would be better to be able to search for some files in other directories as well, namely the global .NET location. The global folders may vary depending on the running operational system. They are defined as follows: Global .NET location: @@ -102,15 +95,13 @@ It’s being proposed that, if the specified version is defined through the conf - For productions: - 1. In relation to the user location: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. - 2. In relation to the executable directory: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. - 3. In relation to the global location: search for the most appropriate version by rolling forward. If it cannot be found, then we were not able to locate any compatible version. + 1. In relation to the executable directory: search for the most appropriate version by rolling forward. If it cannot be found, proceed to the next step. + 2. In relation to the global location: search for the most appropriate version by rolling forward. If it cannot be found, then we were not able to locate any compatible version. - For pre-releases: - 1. In relation to the user location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. - 2. In relation to the executable directory: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. - 3. In relation to the global location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, then we were not able to locate any compatible version. + 1. In relation to the executable directory: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, proceed to the next step. + 2. In relation to the global location: search for the specified version. If it cannot be found, search for the most appropriate version by rolling forward. If no compatible version can be found, then we were not able to locate any compatible version. In the case that the desired version is defined through an argument, the multi-level lookup will happen as well but it will only consider the exact specified version (it will not roll forward). @@ -132,6 +123,5 @@ By following similar logic, it will be possible to implement future changes in t The search would be conducted as follows: -1. In relation to the user location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. -2. In relation to the executable directory: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. -3. In relation to the global location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, then we were not able to find any version folder and an error message must be returned. +1. In relation to the executable directory: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, proceed to the next step. +2. In relation to the global location: search for the specified version. If it cannot be found, choose the most appropriate available version. If there’s no available version, then we were not able to find any version folder and an error message must be returned. diff --git a/src/corehost/cli/args.cpp b/src/corehost/cli/args.cpp index ecaa8d88..e42887bd 100644 --- a/src/corehost/cli/args.cpp +++ b/src/corehost/cli/args.cpp @@ -58,11 +58,7 @@ void setup_shared_store_paths(const hostpolicy_init_t& init, const pal::string_t } // Global shared store dir - if (get_global_shared_store_dir(&args->global_shared_store)) - { - append_path(&args->global_shared_store, get_arch()); - append_path(&args->global_shared_store, init.tfm.c_str()); - } + get_global_shared_store_dirs(&args->global_shared_stores, get_arch(), init.tfm); } bool parse_arguments( diff --git a/src/corehost/cli/args.h b/src/corehost/cli/args.h index 6a994375..cf7827c9 100644 --- a/src/corehost/cli/args.h +++ b/src/corehost/cli/args.h @@ -85,7 +85,7 @@ struct arguments_t std::vector probe_paths; pal::string_t managed_application; pal::string_t local_shared_store; - pal::string_t global_shared_store; + std::vector global_shared_stores; pal::string_t dotnet_shared_store; std::vector env_shared_store; int app_argc; @@ -109,7 +109,10 @@ struct arguments_t } trace::verbose(_X("-- arguments_t: local shared store: '%s'"), local_shared_store.c_str()); trace::verbose(_X("-- arguments_t: dotnet shared store: '%s'"), dotnet_shared_store.c_str()); - trace::verbose(_X("-- arguments_t: global shared store: '%s'"), global_shared_store.c_str()); + for (const auto& global_shared : global_shared_stores) + { + trace::verbose(_X("-- arguments_t: global shared store: '%s'"), global_shared.c_str()); + } } } }; diff --git a/src/corehost/cli/deps_resolver.cpp b/src/corehost/cli/deps_resolver.cpp index 9b8d43d2..d7807aaf 100644 --- a/src/corehost/cli/deps_resolver.cpp +++ b/src/corehost/cli/deps_resolver.cpp @@ -162,9 +162,14 @@ void deps_resolver_t::setup_shared_store_probes( m_probes.push_back(probe_config_t::lookup(args.dotnet_shared_store)); } - if (args.global_shared_store != args.dotnet_shared_store && pal::directory_exists(args.global_shared_store)) + + for (const auto& global_shared : args.global_shared_stores) { - m_probes.push_back(probe_config_t::lookup(args.global_shared_store)); + if (global_shared != args.dotnet_shared_store && pal::directory_exists(global_shared)) + { + // Shared Store probe: DOTNET_SHARED_STORE + m_probes.push_back(probe_config_t::lookup(global_shared)); + } } } diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 806ed918..17472c8e 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -333,7 +333,7 @@ bool fx_muxer_t::resolve_hostpolicy_dir(host_mode_t mode, return false; } -void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, +fx_ver_t fx_muxer_t::resolve_framework_version(const std::vector& version_list, const pal::string_t& fx_ver, const fx_ver_t& specified, const bool& patch_roll_fwd, @@ -341,8 +341,7 @@ void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, { trace::verbose(_X("Attempting FX roll forward starting from [%s]"), fx_ver.c_str()); - std::vector list; - pal::readdir(fx_dir, &list); + fx_ver_t most_compatible = specified; if (!specified.is_prerelease()) { @@ -350,10 +349,10 @@ void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, { trace::verbose(_X("'Roll forward on no candidate fx' enabled. Looking for the least production greater than or equal to [%s]"), fx_ver.c_str()); fx_ver_t next_lowest(-1, -1, -1); - for (const auto& version : list) + for (const auto& ver : version_list) { - fx_ver_t ver(-1, -1, -1); - if (fx_ver_t::parse(version, &ver, true) && (ver >= specified)) + + if (!ver.is_prerelease() && ver >= specified) { next_lowest = (next_lowest == fx_ver_t(-1, -1, -1)) ? ver : std::min(next_lowest, ver); } @@ -371,12 +370,11 @@ void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, if (patch_roll_fwd) { trace::verbose(_X("Applying patch roll forward from [%s]"), most_compatible.as_str().c_str()); - for (const auto& version : list) + for (const auto& ver : version_list) { - trace::verbose(_X("Inspecting version... [%s]"), version.c_str()); - fx_ver_t ver(-1, -1, -1); + trace::verbose(_X("Inspecting version... [%s]"), ver.as_str().c_str()); - if (fx_ver_t::parse(version, &ver, true) && // true -- only prod. prevents roll forward to prerelease. + if (!ver.is_prerelease() && // only prod. prevents roll forward to prerelease. ver.get_major() == most_compatible.get_major() && ver.get_minor() == most_compatible.get_minor()) { @@ -388,13 +386,12 @@ void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, } else { - for (const auto& version : list) + for (const auto& ver : version_list) { - trace::verbose(_X("Inspecting version... [%s]"), version.c_str()); - fx_ver_t ver(-1, -1, -1); + trace::verbose(_X("Inspecting version... [%s]"), ver.as_str().c_str()); - if (fx_ver_t::parse(version, &ver, false) && // false -- implies both production and prerelease. - ver.is_prerelease() && // prevent roll forward to production. + //both production and prerelease. + if (ver.is_prerelease() && // prevent roll forward to production. ver.get_major() == specified.get_major() && ver.get_minor() == specified.get_minor() && ver.get_patch() == specified.get_patch() && @@ -405,8 +402,8 @@ void fx_muxer_t::resolve_roll_forward(pal::string_t& fx_dir, } } } - pal::string_t most_compatible_str = most_compatible.as_str(); - append_path(&fx_dir, most_compatible_str.c_str()); + + return most_compatible; } pal::string_t fx_muxer_t::resolve_fx_dir(host_mode_t mode, @@ -438,30 +435,27 @@ pal::string_t fx_muxer_t::resolve_fx_dir(host_mode_t mode, // Multi-level SharedFX lookup will look for the most appropriate version in several locations // by following the priority rank below: - // User directory // .exe directory // Global .NET directory // If it is not activated, then only .exe directory will be considered std::vector hive_dir; pal::string_t local_dir; - pal::string_t global_dir; + std::vector global_dirs; bool multilevel_lookup = multilevel_lookup_enabled(); - if (multilevel_lookup) - { - if (pal::get_local_dotnet_dir(&local_dir)) - { - hive_dir.push_back(local_dir); - } - } hive_dir.push_back(own_dir); - if (multilevel_lookup && pal::get_global_dotnet_dir(&global_dir)) + if (multilevel_lookup && pal::get_global_dotnet_dirs(&global_dirs)) { - hive_dir.push_back(global_dir); + for (pal::string_t dir : global_dirs) + { + hive_dir.push_back(dir); + } } bool patch_roll_fwd_enabled = config.get_patch_roll_fwd(); + pal::string_t selected_fx_dir; + fx_ver_t selected_ver(-1, -1, -1); for (pal::string_t dir : hive_dir) { @@ -492,22 +486,60 @@ pal::string_t fx_muxer_t::resolve_fx_dir(host_mode_t mode, { trace::verbose(_X("Did not roll forward because specified version='%s', patch_roll_fwd=%d, roll_fwd_on_no_candidate_fx=%d, chose [%s]"), specified_fx_version.c_str(), patch_roll_fwd_enabled, roll_fwd_on_no_candidate_fx_val, fx_ver.c_str()); + append_path(&fx_dir, fx_ver.c_str()); + if (pal::directory_exists(fx_dir)) + { + trace::verbose(_X("Chose FX version [%s]"), fx_dir.c_str()); + return fx_dir; + } } else { - resolve_roll_forward(fx_dir, fx_ver, specified, patch_roll_fwd_enabled, roll_fwd_on_no_candidate_fx_val); - } + std::vector list; + std::vector version_list; + pal::readdir(fx_dir, &list); - if (pal::directory_exists(fx_dir)) - { - trace::verbose(_X("Chose FX version [%s]"), fx_dir.c_str()); - return fx_dir; + for (const auto& version : list) + { + fx_ver_t ver(-1, -1, -1); + if (fx_ver_t::parse(version, &ver, false)) + { + version_list.push_back(ver); + } + } + + fx_ver_t resolved_ver = resolve_framework_version(version_list, fx_ver, specified, patch_roll_fwd_enabled, roll_fwd_on_no_candidate_fx_val); + + pal::string_t resolved_ver_str = resolved_ver.as_str(); + append_path(&fx_dir, resolved_ver_str.c_str()); + + if (pal::directory_exists(fx_dir)) + { + //Continue to search for a better match if available + std::vector version_list; + version_list.push_back(resolved_ver); + version_list.push_back(selected_ver); + resolved_ver = resolve_framework_version(version_list, fx_ver, specified, patch_roll_fwd_enabled, roll_fwd_on_no_candidate_fx_val); + + if (resolved_ver != selected_ver) + { + trace::verbose(_X("Changing Selected FX version from [%s] to [%s]"), selected_fx_dir.c_str(), fx_dir.c_str()); + selected_ver = resolved_ver; + selected_fx_dir = fx_dir; + } + } } } - trace::error(_X("It was not possible to find any compatible framework version")); - return pal::string_t(); + if (selected_fx_dir.empty()) + { + trace::error(_X("It was not possible to find any compatible framework version")); + return pal::string_t(); + } + + trace::verbose(_X("Chose FX version [%s]"), selected_fx_dir.c_str()); + return selected_fx_dir; } pal::string_t fx_muxer_t::resolve_cli_version(const pal::string_t& global_json) @@ -656,7 +688,7 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal std::vector hive_dir; pal::string_t local_dir; - pal::string_t global_dir; + std::vector global_dirs; bool multilevel_lookup = multilevel_lookup_enabled(); if (multilevel_lookup) @@ -672,9 +704,12 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal hive_dir.push_back(own_dir); } - if (multilevel_lookup && pal::get_global_dotnet_dir(&global_dir)) + if (multilevel_lookup && pal::get_global_dotnet_dirs(&global_dirs)) { - hive_dir.push_back(global_dir); + for (pal::string_t dir : global_dirs) + { + hive_dir.push_back(dir); + } } pal::string_t cli_version; diff --git a/src/corehost/cli/fxr/fx_muxer.h b/src/corehost/cli/fxr/fx_muxer.h index 5fbae1c2..3b762ace 100644 --- a/src/corehost/cli/fxr/fx_muxer.h +++ b/src/corehost/cli/fxr/fx_muxer.h @@ -35,7 +35,7 @@ private: const std::vector& probe_realpaths, const runtime_config_t& config, pal::string_t* impl_dir); - static void resolve_roll_forward(pal::string_t& fx_dir, const pal::string_t& fx_ver, const fx_ver_t& specified, const bool& patch_roll_fwd, const int& roll_fwd_on_no_candidate_fx); + static fx_ver_t resolve_framework_version(const std::vector& version_list, const pal::string_t& fx_ver, const fx_ver_t& specified, const bool& patch_roll_fwd, const int& roll_fwd_on_no_candidate_fx); static pal::string_t resolve_fx_dir(host_mode_t mode, const pal::string_t& own_dir, const runtime_config_t& config, const pal::string_t& specified_fx_version, const int& roll_fwd_on_no_candidate_fx_val); static pal::string_t resolve_cli_version(const pal::string_t& global); static bool resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::string_t* cli_sdk); diff --git a/src/corehost/common/pal.h b/src/corehost/common/pal.h index 13f6f61a..76fb18ea 100644 --- a/src/corehost/common/pal.h +++ b/src/corehost/common/pal.h @@ -211,7 +211,9 @@ namespace pal bool getenv(const char_t* name, string_t* recv); bool get_default_servicing_directory(string_t* recv); bool get_local_dotnet_dir(string_t* recv); - bool get_global_dotnet_dir(string_t* recv); + //On Linux, we determine global location by enumerating the location where dotnet is present on path, hence there could be multiple such locations + //On Windows there will be only one global location + bool get_global_dotnet_dirs(std::vector* recv); bool get_default_breadcrumb_store(string_t* recv); bool is_path_rooted(const string_t& path); diff --git a/src/corehost/common/pal.unix.cpp b/src/corehost/common/pal.unix.cpp index 2ae8aa01..9f0fb4fe 100644 --- a/src/corehost/common/pal.unix.cpp +++ b/src/corehost/common/pal.unix.cpp @@ -183,7 +183,7 @@ bool is_executable(const pal::string_t& file_path) } static -bool locate_dotnet_on_path(pal::string_t* dotnet_exe) +bool locate_dotnet_on_path(std::vector* dotnet_exes) { pal::string_t path; if (!pal::getenv(_X("PATH"), &path)) @@ -204,12 +204,17 @@ bool locate_dotnet_on_path(pal::string_t* dotnet_exe) append_path(&tok, _X("dotnet")); if (pal::realpath(&tok) && is_executable(tok)) { - *dotnet_exe = tok; - return true; + dotnet_exes->push_back(tok); } tok.clear(); } - return false; + + if (dotnet_exes->empty()) + { + return false; + } + + return true; } bool pal::get_local_dotnet_dir(pal::string_t* recv) @@ -234,16 +239,21 @@ bool pal::get_local_dotnet_dir(pal::string_t* recv) return true; } - bool pal::get_global_dotnet_dir(pal::string_t* recv) + bool pal::get_global_dotnet_dirs(std::vector* recv) { - recv->clear(); - pal::string_t dotnet_exe; - if (!locate_dotnet_on_path(&dotnet_exe)) + + std::vector dotnet_exes; + if (!locate_dotnet_on_path(&dotnet_exes)) { return false; } - pal::string_t dir = get_directory(dotnet_exe); - recv->assign(dir); + + for (pal::string_t path : dotnet_exes) + { + pal::string_t dir = get_directory(path); + recv->push_back(dir); + } + return true; } diff --git a/src/corehost/common/pal.windows.cpp b/src/corehost/common/pal.windows.cpp index b13e0ab8..c7ee63e2 100644 --- a/src/corehost/common/pal.windows.cpp +++ b/src/corehost/common/pal.windows.cpp @@ -195,14 +195,16 @@ bool pal::get_default_servicing_directory(string_t* recv) return true; } -bool pal::get_global_dotnet_dir(pal::string_t* dir) +bool pal::get_global_dotnet_dirs(std::vector* dirs) { - if (!get_file_path_from_env(_X("ProgramFiles"), dir)) + pal::string_t dir; + if (!get_file_path_from_env(_X("ProgramFiles"), &dir)) { return false; } - append_path(dir, _X("dotnet")); + append_path(&dir, _X("dotnet")); + dirs->push_back(dir); return true; } diff --git a/src/corehost/common/utils.cpp b/src/corehost/common/utils.cpp index e49039d7..b104d32b 100644 --- a/src/corehost/common/utils.cpp +++ b/src/corehost/common/utils.cpp @@ -278,13 +278,21 @@ bool get_env_shared_store_dirs(std::vector* dirs, const pal::stri return true; } -bool get_global_shared_store_dir(pal::string_t* dir) +bool get_global_shared_store_dirs(std::vector* dirs, const pal::string_t& arch, const pal::string_t& tfm) { - if (!pal::get_global_dotnet_dir(dir)) + std::vector global_dirs; + if (!pal::get_global_dotnet_dirs(&global_dirs)) { return false; } - append_path(dir, RUNTIME_STORE_DIRECTORY_NAME); + + for (pal::string_t dir : global_dirs) + { + append_path(&dir, RUNTIME_STORE_DIRECTORY_NAME); + append_path(&dir, arch.c_str()); + append_path(&dir, tfm.c_str()); + dirs->push_back(dir); + } return true; } diff --git a/src/corehost/common/utils.h b/src/corehost/common/utils.h index dbbc3271..ec181422 100644 --- a/src/corehost/common/utils.h +++ b/src/corehost/common/utils.h @@ -41,5 +41,5 @@ bool parse_known_args( bool skip_utf8_bom(pal::ifstream_t* stream); bool get_env_shared_store_dirs(std::vector* dirs, const pal::string_t& arch, const pal::string_t& tfm); bool get_local_shared_store_dir(pal::string_t* recv); -bool get_global_shared_store_dir(pal::string_t* recv); +bool get_global_shared_store_dirs(std::vector* dirs, const pal::string_t& arch, const pal::string_t& tfm); #endif From c708029974568cf4aa0f8caff615a8c38d2abc2a Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Fri, 19 May 2017 15:53:37 -0700 Subject: [PATCH 057/198] Modifying test for multilevel FX lookup - Remove user profile testing - add test for multiple global locations for non windows --- ...nThatICareAboutMultilevelSharedFxLookup.cs | 323 ++++++++++++------ src/test/TestUtils/Command.cs | 36 ++ src/test/TestUtils/DotNetCli.cs | 3 +- 3 files changed, 262 insertions(+), 100 deletions(-) diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs index 5f9c0627..0669d757 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs @@ -1,4 +1,5 @@ using Microsoft.DotNet.InternalAbstractions; +using Microsoft.DotNet.Cli.Build.Framework; using Newtonsoft.Json.Linq; using System; using System.IO; @@ -14,33 +15,40 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku private string _currentWorkingDir; private string _userDir; private string _executableDir; + private string _globalDir; private string _cwdSharedFxBaseDir; private string _userSharedFxBaseDir; private string _exeSharedFxBaseDir; + private string _globalSharedFxBaseDir; private string _builtSharedFxDir; private string _cwdSelectedMessage; private string _userSelectedMessage; private string _exeSelectedMessage; + private string _globalSelectedMessage; private string _sharedFxVersion; - + private string _multilevelDir; + private string _builtDotnet; + private string _hostPolicyDllName; + public GivenThatICareAboutMultilevelSharedFxLookup() { // From the artifacts dir, it's possible to find where the sharedFrameworkPublish folder is. We need // to locate it because we'll copy its contents into other folders string artifactsDir = Environment.GetEnvironmentVariable("TEST_ARTIFACTS"); - string builtDotnet = Path.Combine(artifactsDir, "sharedFrameworkPublish"); + _builtDotnet = Path.Combine(artifactsDir, "sharedFrameworkPublish"); // The dotnetMultilevelSharedFxLookup dir will contain some folders and files that will be // necessary to perform the tests string baseMultilevelDir = Path.Combine(artifactsDir, "dotnetMultilevelSharedFxLookup"); - string multilevelDir = CalculateMultilevelDirectory(baseMultilevelDir); + _multilevelDir = CalculateMultilevelDirectory(baseMultilevelDir); // The three tested locations will be the cwd, the user folder and the exe dir. Both cwd and exe dir // are easily overwritten, so they will be placed inside the multilevel folder. The actual user location will // be used during tests - _currentWorkingDir = Path.Combine(multilevelDir, "cwd"); - _userDir = Path.Combine(multilevelDir, "user"); - _executableDir = Path.Combine(multilevelDir, "exe"); + _currentWorkingDir = Path.Combine(_multilevelDir, "cwd"); + _userDir = Path.Combine(_multilevelDir, "user"); + _executableDir = Path.Combine(_multilevelDir, "exe"); + _globalDir = Path.Combine(_multilevelDir, "global"); RepoDirectories = new RepoDirectoriesProvider(builtDotnet: _executableDir); @@ -48,12 +56,17 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku _cwdSharedFxBaseDir = Path.Combine(_currentWorkingDir, "shared", "Microsoft.NETCore.App"); _userSharedFxBaseDir = Path.Combine(_userDir, ".dotnet", RepoDirectories.BuildArchitecture, "shared", "Microsoft.NETCore.App"); _exeSharedFxBaseDir = Path.Combine(_executableDir, "shared", "Microsoft.NETCore.App"); + _globalSharedFxBaseDir = Path.Combine(_globalDir, "shared", "Microsoft.NETCore.App"); // Create directories. It's necessary to copy the entire publish folder to the exe dir because // we'll need to build from it. The CopyDirectory method automatically creates the dest dir Directory.CreateDirectory(_cwdSharedFxBaseDir); Directory.CreateDirectory(_userSharedFxBaseDir); - CopyDirectory(builtDotnet, _executableDir); + Directory.CreateDirectory(_globalSharedFxBaseDir); + CopyDirectory(_builtDotnet, _executableDir); + + //Copy dotnet to global directory + File.Copy(Path.Combine(_builtDotnet, $"dotnet{Constants.ExeSuffix}"), Path.Combine(_globalDir, $"dotnet{Constants.ExeSuffix}"), true); // Restore and build SharedFxLookupPortableApp from exe dir PreviouslyBuiltAndRestoredPortableTestProjectFixture = new TestProjectFixture("SharedFxLookupPortableApp", RepoDirectories) @@ -65,14 +78,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // locate the builtSharedFxDir from which we can get the files contained in the version folder string greatestVersionSharedFxPath = fixture.BuiltDotnet.GreatestVersionSharedFxPath; _sharedFxVersion = (new DirectoryInfo(greatestVersionSharedFxPath)).Name; - _builtSharedFxDir = Path.Combine(builtDotnet, "shared", "Microsoft.NETCore.App", _sharedFxVersion); + _builtSharedFxDir = Path.Combine(_builtDotnet, "shared", "Microsoft.NETCore.App", _sharedFxVersion); - string hostPolicyDllName = Path.GetFileName(fixture.TestProject.HostPolicyDll); + _hostPolicyDllName = Path.GetFileName(fixture.TestProject.HostPolicyDll); // Trace messages used to identify from which folder the framework was picked - _cwdSelectedMessage = $"The expected {hostPolicyDllName} directory is [{_cwdSharedFxBaseDir}"; - _userSelectedMessage = $"The expected {hostPolicyDllName} directory is [{_userSharedFxBaseDir}"; - _exeSelectedMessage = $"The expected {hostPolicyDllName} directory is [{_exeSharedFxBaseDir}"; + _cwdSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{_cwdSharedFxBaseDir}"; + _userSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{_userSharedFxBaseDir}"; + _exeSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{_exeSharedFxBaseDir}"; + _globalSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{_globalSharedFxBaseDir}"; } [Fact] @@ -111,7 +125,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0"); // Version: 9999.0.0 - // User: 9999.0.0 + // User: 9999.0.0 --> should not be picked // Exe: 9999.0.0 // Expected: 9999.0.0 from user dir dotnet.Exec(appDll) @@ -124,7 +138,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_userSelectedMessage); + .HaveStdErrContaining(_exeSelectedMessage); // Add a dummy version in the cwd AddAvailableSharedFxVersions(_cwdSharedFxBaseDir, "9999.0.0"); @@ -133,7 +147,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // CWD: 9999.0.0 --> should not be picked // User: 9999.0.0 // Exe: 9999.0.0 - // Expected: 9999.0.0 from user dir + // Expected: 9999.0.0 from user Exe dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") @@ -144,7 +158,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_userSelectedMessage); + .HaveStdErrContaining(_exeSelectedMessage); // Remove dummy folders from user dir DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0"); @@ -160,70 +174,102 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku var appDll = fixture.TestProject.AppDll; // Add some dummy versions - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.0-dummy0"); + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); // Set desired version = 9999.0.0-dummy0 string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); SetRuntimeConfigJson(runtimeConfig, "9999.0.0-dummy0"); // Version: 9999.0.0-dummy0 - // User: 9999.0.2, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // Expected: 9999.0.0-dummy2 from user dir + // Exe: 9999.0.0 + // global: 9999.0.2, 9999.0.0-dummy2 + // Expected: 9999.0.0-dummy2 from global dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) .CaptureStdOut() .CaptureStdErr() .Execute() .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-dummy2")); - - // Add a prerelease dummy version in userdir - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0-dummy1"); + .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.0-dummy2")); + + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.0-dummy1"); // Version: 9999.0.0-dummy0 - // User: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // Expected: 9999.0.0-dummy1 from User + // Exe: 9999.0.0 + // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 + // Expected: 9999.0.0-dummy1 from global dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) .CaptureStdOut() .CaptureStdErr() .Execute() .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-dummy1")); + .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.0-dummy1")); + + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0-dummy0"); + + // Version: 9999.0.0-dummy0 + // Exe: 9999.0.0, 9999.0.0-dummy0 + // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 + // Expected: 9999.0.0-dummy1 from global + dotnet.Exec(appDll) + .WorkingDirectory(_currentWorkingDir) + .EnvironmentVariable("COREHOST_TRACE", "1") + .WithGlobalLocation(_globalDir) + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0-dummy0")); - // Set desired version = 9999.0.0 SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); + // Version: 9999.0.0 + // Exe: 9999.0.0, 9999.0.0-dummy0 + // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 + // Expected: 9999.0.2 from global + dotnet.Exec(appDll) + .WorkingDirectory(_currentWorkingDir) + .EnvironmentVariable("COREHOST_TRACE", "1") + .WithGlobalLocation(_globalDir) + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.2")); + + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.3"); // Version: 9999.0.0 - // CWD: 9999.0.0-dummy1 - // User: 9999.0.2, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // Expected: 9999.0.2 from user dir + // Exe: 9999.0.0, 9999.0.0-dummy0, 9999.0.3 + // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 + // Expected: 9999.0.0-dummy1 from global dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) .CaptureStdOut() .CaptureStdErr() .Execute() .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.2")); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.3")); - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); + DeleteAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.0-dummy0","9999.0.3"); + DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy1", "9999.0.0-dummy2"); } [Fact] @@ -236,17 +282,16 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku var appDll = fixture.TestProject.AppDll; // Add some dummy versions - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.3", "9999.0.0-dummy3"); + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2", "9999.0.0", "9999.0.3", "9999.0.0-dummy3"); + // Version: 9999.0.0 (through --fx-version arg) - // User: 9999.0.2, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.3, 9999.0.0-dummy3 + // Exe: 9999.0.2, 9999.0.0-dummy2, 9999.0.0, 9999.0.3, 9999.0.0-dummy3 + // global: empty // Expected: 9999.0.0 from exe dir dotnet.Exec("--fx-version", "9999.0.0", appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") - .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute() @@ -256,13 +301,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0")); // Version: 9999.0.0-dummy1 (through --fx-version arg) - // User: 9999.0.2, 9999.0.0-dummy2 - // Exe: 9999.0.0, 9999.0.3, 9999.0.0-dummy3 + // Exe: 9999.0.2, 9999.0.0-dummy2,9999.0.0, 9999.0.3, 9999.0.0-dummy3 + // global: empty // Expected: no compatible version dotnet.Exec("--fx-version", "9999.0.0-dummy1", appDll) .WorkingDirectory(_currentWorkingDir) .EnvironmentVariable("COREHOST_TRACE", "1") - .WithUserProfile(_userDir) .CaptureStdOut() .CaptureStdErr() .Execute(fExpectedToFail:true) @@ -271,8 +315,8 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .And .HaveStdErrContaining("It was not possible to find any compatible framework version"); - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); + + DeleteAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.3", "9999.0.0-dummy3", "9999.0.2", "9999.0.0-dummy2"); } [Fact] @@ -297,7 +341,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Expected: 10000.1.3 from exe dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -317,7 +360,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Expected: 9999.1.1 from exe dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -351,7 +393,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Expected: no compatible version dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -377,16 +418,37 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); // Add a dummy version in the exe dir - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.0"); + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through env var - // User: empty - // Exe: 9999.1.0 - // Expected: 9999.1.0 from exe dir + // Exe: empty + // Global: 9999.1.0 + // Expected: 9999.1.0 from global dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) + .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") + .EnvironmentVariable("COREHOST_TRACE", "1") + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(_globalSelectedMessage); + + // Add a dummy version in the user dir + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); + + // Version: 9999.0.0 + // 'Roll forward on no candidate fx' enabled through env var + // Exe: 9999.1.1 + // Global: 9999.1.0 + // Expected: 9999.1.1 from exe dir + dotnet.Exec(appDll) + .WorkingDirectory(_currentWorkingDir) + .WithGlobalLocation(_globalDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -397,29 +459,9 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .And .HaveStdErrContaining(_exeSelectedMessage); - // Add a dummy version in the user dir - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.1"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // User: 9999.1.1 - // Exe: 9999.1.0 - // Expected: 9999.1.1 from user dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_userSelectedMessage); - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.1"); + DeleteAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); + DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); } [Fact] @@ -437,8 +479,8 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 1); // Add some dummy versions - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.0"); - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.0"); + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.0"); // Set desired version = 9999.0.0 // Disable 'roll forward on no candidate fx' through runtimeconfig @@ -447,12 +489,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' disabled through runtimeconfig - // User: 9999.1.0 - // Exe: 9999.0.0 - // Expected: 9999.0.0 from exe dir + // Exe: 9999.1.0 + // Global: 9999.0.0 + // Expected: 9999.0.0 from global dir dotnet.Exec(appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -461,7 +503,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_exeSelectedMessage); + .HaveStdErrContaining(_globalSelectedMessage); } [Fact] @@ -479,17 +521,17 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 0); // Add some dummy versions - AddAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.1.0"); - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); + AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.2"); // Version: 9999.0.0 // 'Roll forward on no candidate fx' enabled through argument - // User: 9999.1.0 - // Exe: 9999.0.0 - // Expected: 9999.1.0 from User + // Exe: 9999.1.1 + // Global: 9999.1.2 + // Expected: 9999.1.2 from global dotnet.Exec("--roll-forward-on-no-candidate-fx", "1", appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() .CaptureStdErr() @@ -497,7 +539,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_userSelectedMessage); + .HaveStdErrContaining(_globalSelectedMessage); // Set desired version = 9999.0.0 // Enable 'roll forward on no candidate fx' through Runtimeconfig @@ -505,12 +547,67 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku // Version: 9999.0.0 // 'Roll forward on no candidate fx' disabled through argument - // User: 9999.1.0 - // Exe: 9999.0.0 - // Expected: 9999.0.0 from exe dir + // Exe: 9999.1.1 + // Global: 9999.1.2 + // Expected: does not resolve FX dotnet.Exec("--roll-forward-on-no-candidate-fx", "0", appDll) .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) + .WithGlobalLocation(_globalDir) + .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") + .EnvironmentVariable("COREHOST_TRACE", "1") + .CaptureStdOut() + .CaptureStdErr() + .Execute(fExpectedToFail:true) + .Should() + .Fail() + .And + .HaveStdErrContaining("It was not possible to find any compatible framework version"); + + } + + [Fact] + public void Ensure_On_NonWindows_Multiple_Global_Locations_Are_Probed() + { + //This test is only applicable on non windows as it tests probing for global + //locations on path + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + return; + } + + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture + .Copy(); + + var dotnet = fixture.BuiltDotnet; + var appDll = fixture.TestProject.AppDll; + + var secondary_globalDir = Path.Combine(_multilevelDir, "secondary_global"); + var secondary_globalSharedFxBaseDir = Path.Combine(secondary_globalDir, "shared", "Microsoft.NETCore.App"); + + var secondary_globalSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{secondary_globalSharedFxBaseDir}"; + + Directory.CreateDirectory(_globalSharedFxBaseDir); + Directory.CreateDirectory(secondary_globalSharedFxBaseDir); + //Copy dotnet to global directory + File.Copy(Path.Combine(_builtDotnet, $"dotnet{Constants.ExeSuffix}"), Path.Combine(secondary_globalDir, $"dotnet{Constants.ExeSuffix}"), true); + + // Set desired version = 9999.0.0 + string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); + SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); + + // Add a dummy version in the exe dir + AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); + + // Version: 9999.0.0 + // 'Roll forward on no candidate fx' enabled through env var + // Exe: empty + // Secondary_Global: empty + // Global: 9999.1.0 + // Expected: 9999.1.0 from global dir + dotnet.Exec(appDll) + .WorkingDirectory(_currentWorkingDir) + .WithGlobalLocation(secondary_globalDir) + .WithGlobalLocation(_globalDir) .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") .EnvironmentVariable("COREHOST_TRACE", "1") .CaptureStdOut() @@ -519,9 +616,37 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Should() .Pass() .And - .HaveStdErrContaining(_exeSelectedMessage); + .HaveStdErrContaining(_globalSelectedMessage); + + // Add a dummy version in the user dir + AddAvailableSharedFxVersions(secondary_globalSharedFxBaseDir, "9999.1.1"); + + // Version: 9999.0.0 + // 'Roll forward on no candidate fx' enabled through env var + // Exe: empty + // Secondary_Global: 9999.1.1 + // Global: 9999.1.0 + // Expected: 9999.1.1 from Secondary_Global dir + dotnet.Exec(appDll) + .WorkingDirectory(_currentWorkingDir) + .WithGlobalLocation(secondary_globalDir) + .WithGlobalLocation(_globalDir) + .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") + .EnvironmentVariable("COREHOST_TRACE", "1") + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(secondary_globalSelectedMessage); + + // Remove dummy folders from user dir + DeleteAvailableSharedFxVersions(secondary_globalSharedFxBaseDir, "9999.1.1"); + DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); } + // This method adds a list of new framework version folders in the specified // sharedFxBaseDir. The files are copied from the _buildSharedFxDir. // Remarks: diff --git a/src/test/TestUtils/Command.cs b/src/test/TestUtils/Command.cs index 4ecba533..4f536358 100644 --- a/src/test/TestUtils/Command.cs +++ b/src/test/TestUtils/Command.cs @@ -238,6 +238,42 @@ namespace Microsoft.DotNet.Cli.Build.Framework _process.StartInfo.Environment[userDir] = userprofile; return this; } + public Command SanitizeGlobalLocation() + { + if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) + { + var current_path = _process.StartInfo.Environment["PATH"]; + var new_path = new System.Text.StringBuilder(); + //Remove any global dotnet that has been set + foreach (var sub_path in current_path.Split(Path.PathSeparator)) + { + var candidate = Path.Combine(sub_path, "dotnet"); + if (!File.Exists(candidate)) + { + new_path.Append(sub_path); + new_path.Append(Path.PathSeparator); + } + } + _process.StartInfo.Environment["PATH"] = new_path.ToString(); + } + return this; + } + public Command WithGlobalLocation(string global) + { + + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + throw new NotImplementedException("Global location override needs work "); + } + else + { + var current_path = _process.StartInfo.Environment["PATH"]; + _process.StartInfo.Environment["PATH"] = current_path + Path.PathSeparator + global; + } + + + return this; + } public Command EnvironmentVariable(string name, string value) { diff --git a/src/test/TestUtils/DotNetCli.cs b/src/test/TestUtils/DotNetCli.cs index bc861337..60b18284 100644 --- a/src/test/TestUtils/DotNetCli.cs +++ b/src/test/TestUtils/DotNetCli.cs @@ -31,7 +31,8 @@ namespace Microsoft.DotNet.Cli.Build } return Command.Create(Path.Combine(BinPath, $"dotnet{Constants.ExeSuffix}"), newArgs) - .EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1"); + .EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1") + .SanitizeGlobalLocation(); } public Command Restore(params string[] args) => Exec("restore", args); From ee039a6cb18f016a6a4b4ed9d9433636f63aef7a Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Tue, 23 May 2017 11:52:20 -0700 Subject: [PATCH 058/198] Disabling global Shared FX lookup tests on windows --- ...nThatICareAboutMultilevelSharedFxLookup.cs | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs index 0669d757..5b311991 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs @@ -159,14 +159,17 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .Pass() .And .HaveStdErrContaining(_exeSelectedMessage); - - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(_userSharedFxBaseDir, "9999.0.0"); } [Fact] public void SharedFxLookup_Must_Roll_Forward_Before_Looking_Into_Another_Folder() { + //https://github.com/dotnet/core-setup/issues/1553 + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -407,6 +410,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku [Fact] public void Roll_Forward_On_No_Candidate_Fx_Must_Look_Into_All_Lookup_Folders() { + //https://github.com/dotnet/core-setup/issues/1553 + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -467,6 +476,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku [Fact] public void Roll_Forward_On_No_Candidate_Fx_May_Be_Enabled_Through_Runtimeconfig_Json_File() { + //https://github.com/dotnet/core-setup/issues/1553 + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -509,6 +524,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku [Fact] public void Roll_Forward_On_No_Candidate_Fx_May_Be_Enabled_Through_Argument() { + //https://github.com/dotnet/core-setup/issues/1553 + if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) + { + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); From a432d48466f680dc0ba120734ec59d0128489f26 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Tue, 23 May 2017 18:07:30 -0700 Subject: [PATCH 059/198] Format installer and archive file name per new guidelines (#2461) * format installer and archive file name per new guidelines * Updated the installer and compressed files per feedback. Also, taking care of extra space in Brand name. --- dir.props | 10 +++++++++- publish/dir.targets | 2 +- src/pkg/packaging/deb/package.props | 2 +- src/pkg/packaging/dir.props | 18 +++++++++--------- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dir.props b/dir.props index 3a79abc7..9f51603c 100644 --- a/dir.props +++ b/dir.props @@ -290,9 +290,17 @@ + $(PackagesOutDir)dotnet-runtime- $(PackagesOutDir)dotnet-host- $(PackagesOutDir)dotnet-hostfxr- - $(PackagesOutDir)dotnet-sharedframework- + $(PackagesOutDir)dotnet-runtime- + + + internal + $(SharedHostInstallerStart)$(InstallerStartSuffix)- + $(HostFxrInstallerStart)$(InstallerStartSuffix)- + $(SharedFrameworkInstallerStart)$(InstallerStartSuffix)- + diff --git a/publish/dir.targets b/publish/dir.targets index 6539970f..d28c172f 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -77,7 +77,7 @@ dotnet-hostfxr-$(HostResolverVersion.ToLower()) - dotnet-sharedframework-$(SharedFrameworkName.ToLower())-$(SharedFrameworkNugetVersion.ToLower()) + dotnet-runtime-$(SharedFrameworkNugetVersion.ToLower()) diff --git a/src/pkg/packaging/deb/package.props b/src/pkg/packaging/deb/package.props index e52aec35..5142be74 100644 --- a/src/pkg/packaging/deb/package.props +++ b/src/pkg/packaging/deb/package.props @@ -13,7 +13,7 @@ dotnet-hostfxr-$(HostResolverVersion) $(HostFxrDebPkgName.ToLower()) - dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkNugetVersion) + dotnet-runtime-$(SharedFrameworkNugetVersion) $(SharedFxDebPkgName.ToLower()) \ No newline at end of file diff --git a/src/pkg/packaging/dir.props b/src/pkg/packaging/dir.props index ffac9a01..0a4b661f 100644 --- a/src/pkg/packaging/dir.props +++ b/src/pkg/packaging/dir.props @@ -16,20 +16,20 @@ - $(PackageTargetRid).$(SharedFrameworkNugetVersion) - $(PackageTargetRid).$(HostResolverVersion) + $(SharedFrameworkNugetVersion)-$(PackageTargetRid) + $(HostResolverVersion)-$(PackageTargetRid) - dotnet-$(ProductMoniker)$(CompressedFileExtension) - dotnet-hostfxr-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension) - dotnet-sharedframework-$(ProductMoniker)$(CompressedFileExtension) - dotnet-sharedframework-symbols-$(ProductMoniker)$(CompressedFileExtension) + dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension) + dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension) + dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension) + dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension) - $(PackagesOutDir)dotnet-$(ProductMoniker)$(CombinedInstallerExtension) - $(PackagesOutDir)dotnet-$(ProductMoniker)-engine.exe + $(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension) + $(CombinedInstallerStart)$(ProductMoniker)-engine.exe $(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension) $(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension) $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) @@ -40,6 +40,6 @@ Microsoft .NET Core $(ProductionVersion) $(ReleaseBrandSuffix) $(ProductBrandPrefix) Host $(ProductBrandPrefix) Host FX Resolver - $(ProductBrandPrefix) Runtime + $(ProductBrandPrefix) Runtime \ No newline at end of file From 21153046bf35ddf5106928c1fc1233dae21f49a6 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Tue, 23 May 2017 21:48:48 -0700 Subject: [PATCH 060/198] Add an explicit dependency on ICU for debian packages (#2507) --- .../deb/dotnet-sharedframework-debian_config.json | 4 ++-- src/pkg/packaging/deb/package.targets | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json index cd0bf646..f714ca39 100644 --- a/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json +++ b/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json @@ -13,7 +13,7 @@ "package_version":"1.0.0.0", "package_revision":"1", "urgency" : "low", - "changelog_message" : "Inital shared framework." + "changelog_message" : "Initial shared framework." }, "control": { @@ -31,7 +31,7 @@ "debian_dependencies":{ "%HOSTFXR_DEBIAN_PACKAGE_NAME%" : {}, "libssl1.0.0" : {}, - "libcurl3" : {} + "%LIBICU_PACKAGE_NAME%": {} }, "debian_ignored_dependencies" : [ diff --git a/src/pkg/packaging/deb/package.targets b/src/pkg/packaging/deb/package.targets index 20626a5a..7e8b8586 100644 --- a/src/pkg/packaging/deb/package.targets +++ b/src/pkg/packaging/deb/package.targets @@ -215,6 +215,12 @@ + + + + + @@ -248,6 +254,10 @@ $(SharedFrameworkBrandName) + + $(LibIcuPackageName) + + Date: Wed, 24 May 2017 06:47:35 -0700 Subject: [PATCH 061/198] Update CoreClr, CoreFx, Standard, WCF to preview2-25324-01, preview2-25324-02, preview2-25324-01, preview2-25324-01, respectively --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index c09eddec..254c82ff 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 08ad835fac10ec04e5302ab59fda6cacdde98a60 - 08ad835fac10ec04e5302ab59fda6cacdde98a60 - 08ad835fac10ec04e5302ab59fda6cacdde98a60 - 08ad835fac10ec04e5302ab59fda6cacdde98a60 + 2ded50b86b1599881e556363fa62bc7bde850525 + 2ded50b86b1599881e556363fa62bc7bde850525 + 2ded50b86b1599881e556363fa62bc7bde850525 + 2ded50b86b1599881e556363fa62bc7bde850525 - 4.4.0-preview2-25322-03 - 2.0.0-preview2-25322-03 - 2.0.0-preview2-25322-01 + 4.4.0-preview2-25324-02 + 2.0.0-preview2-25324-02 + 2.0.0-preview2-25324-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25322-01 + 2.0.0-preview2-25324-01 1.4.1 - 4.4.0-preview2-25322-02 + 4.4.0-preview2-25324-01 From 7ddd3842744b069ac797eca66d47efd09410cf13 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 24 May 2017 12:27:50 -0700 Subject: [PATCH 062/198] Sign Arm binaries in pipeline --- buildpipeline/Core-Setup-Linux-BT.json | 137 ++++- ...BT.json => Core-Setup-Windows-Arm-BT.json} | 205 +------ buildpipeline/Core-Setup-Windows-BT.json | 501 ++++++++++++++++-- buildpipeline/pipeline.json | 12 +- 4 files changed, 622 insertions(+), 233 deletions(-) rename buildpipeline/{Core-Setup-Signing-Windows-BT.json => Core-Setup-Windows-Arm-BT.json} (71%) diff --git a/buildpipeline/Core-Setup-Linux-BT.json b/buildpipeline/Core-Setup-Linux-BT.json index 7e7112fd..3ef95c84 100644 --- a/buildpipeline/Core-Setup-Linux-BT.json +++ b/buildpipeline/Core-Setup-Linux-BT.json @@ -255,7 +255,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1404) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1404) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -274,7 +274,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1404) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1404) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -293,7 +293,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1404) /p:PublishDebToolToFeed=true /p:CliNuGetFeedUrl=$(CLI_NUGET_FEED_URL) /p:CliNuGetApiKey=$(CLI_NUGET_API_KEY) $(CommonMSBuildArguments) $(CommonMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1404) /p:PublishDebToolToFeed=true /p:CliNuGetFeedUrl=$(CLI_NUGET_FEED_URL) /p:CliNuGetApiKey=$(CLI_NUGET_API_KEY) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -350,7 +350,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1604) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -369,7 +369,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1604) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -388,7 +388,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1604) $(CommonMSBuildArguments) $(CommonMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -445,7 +445,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1610) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -464,7 +464,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1610) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -483,7 +483,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1610) $(CommonMSBuildArguments) $(CommonMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -540,7 +540,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Debian8) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -559,7 +559,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Debian8) $(CommonMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -578,7 +578,102 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Debian8) $(CommonMSBuildArguments) $(CommonMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Initialize docker - Rhel7", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_DockerHost_ToolsDirectory)/scripts/docker/init-docker.sh", + "arguments": "$(DockerImageName_Rhel7)", + "workingFolder": "$(PB_DockerHost_Sandbox)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Init tools - Rhel7", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) /bin/bash -c \"HOME=$(PB_GitDirectory); git clean -X -d -f; $(PB_GitDirectory)/init-tools.sh\"", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build traversal build dependencies - Rhel7", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Package - Rhel7", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments)", + "workingFolder": "", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Publish - Rhel7", + "timeoutInMinutes": 0, + "condition": "succeeded()", + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "docker", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -816,10 +911,10 @@ "AdditionalMSBuildProperties": { "value": "/p:UsePrebuiltPortableBinariesForInstallers=true /p:SharedFrameworkPublishDir=/root/sharedFrameworkPublish/" }, - "CommonMSBuildArguments": { - "value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)" + "DistroSpecificMSBuildArguments": { + "value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=false /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)" }, - "CommonMSBuildPublishArgs": { + "DistroSpecificMSBuildPublishArgs": { "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)" }, "PB_DebianKeys": { @@ -873,6 +968,18 @@ "DockerCommonRunArgs_Debian8": { "value": "--name $(PB_DockerContainerName)$(DockerTag_Debian8) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Debian8)" }, + "DockerTag_Rhel7": { + "value": "rhel-7-rpmpkg-c982313-20174116044113" + }, + "DistroRid_Rhel7": { + "value": "rhel.7-x64" + }, + "DockerImageName_Rhel7": { + "value": "$(PB_DockerRepository):$(DockerTag_Rhel7)" + }, + "DockerCommonRunArgs_Rhel7": { + "value": "--name $(PB_DockerContainerName)$(DockerTag_Rhel7) -v \"$(PB_SourcesDirectory):$(PB_GitDirectory)\" -v $(Build.StagingDirectory)/sharedFrameworkPublish/:/root/sharedFrameworkPublish/ -w=\"$(PB_GitDirectory)\" $(DockerImageName_Rhel7)" + }, "CLI_NUGET_FEED_URL": { "value": "https:%2F%2Fdotnet.myget.org/F/cli-deps/api/v2/package" }, diff --git a/buildpipeline/Core-Setup-Signing-Windows-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json similarity index 71% rename from buildpipeline/Core-Setup-Signing-Windows-BT.json rename to buildpipeline/Core-Setup-Windows-Arm-BT.json index ffea6418..1fb49947 100644 --- a/buildpipeline/Core-Setup-Signing-Windows-BT.json +++ b/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -255,168 +255,6 @@ "msbuildLocation": "" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Build and run tests", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\test\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=diag;LogFile=$(PB_SourcesDirectory)\\tests.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign MSI and cab", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignMsiAndCab $(PB_CommonMSBuildArgs) $(MsbuildSigningArguments)", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Extract engine from bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:ExtractEngineBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\extractengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign engine", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignEngine $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Reattach engine to bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:ReattachEngineToBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\reattachengine.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Sign Bundle", - "timeoutInMinutes": 0, - "task": { - "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "solution": "$(PB_SourcesDirectory)\\sign.proj", - "platform": "$(PB_TargetArchitecture)", - "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/t:SignBundle $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signbundle.log", - "clean": "false", - "maximumCpuCount": "false", - "restoreNugetPackages": "false", - "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" - } - }, { "enabled": true, "continueOnError": false, @@ -432,7 +270,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -603,6 +441,13 @@ "PB_SourcesDirectory": { "value": "$(Build.SourcesDirectory)\\core-setup" }, + "PB_ChecksumAzureAccountName": { + "value": "dotnetclichecksums" + }, + "PB_ChecksumAzureAccessToken": { + "value": null, + "isSecret": true + }, "PB_VsoRepoUrl": { "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" }, @@ -613,13 +458,6 @@ "value": null, "isSecret": true }, - "PB_ChecksumAzureAccountName": { - "value": "dotnetclichecksums" - }, - "PB_ChecksumAzureAccessToken": { - "value": null, - "isSecret": true - }, "PB_VsoAccountName": { "value": "dn-bot" }, @@ -637,27 +475,29 @@ "value": "real" }, "PB_CommonMSBuildArgs": { - "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" + "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)" + }, + "PB_AdditionalBuildArguments": { + "value": "" }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" }, "PB_TargetArchitecture": { - "value": "x64", + "value": "arm", "allowOverride": true }, "PB_CleanAgent": { "value": "true" }, - "PB_PublishRidAgnosticPackages": { - "value": "false" - }, "PB_BuildFullPlatformManifest": { "value": "false" } }, "demands": [ - "Agent.OS -equals Windows_NT" + "Agent.OS -equals Windows_NT", + "DotNetFramework", + "Cmd" ], "retentionRules": [ { @@ -669,15 +509,15 @@ "FilePath", "SymbolStore" ], - "daysToKeep": 2, + "daysToKeep": 7, "minimumToKeep": 1, "deleteBuildRecord": true, "deleteTestResults": true } ], - "buildNumberFormat": "$(Date:yyyyMMdd)$(Rev:-rr)", + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 120, + "jobTimeoutInMinutes": 90, "jobCancelTimeoutInMinutes": 5, "badgeEnabled": true, "repository": { @@ -687,7 +527,7 @@ "fetchDepth": "0", "gitLfsSupport": "false", "skipSyncSource": "true", - "cleanOptions": "3" + "cleanOptions": "0" }, "id": "c19ea379-feb7-4ca5-8f7f-5f2b5095ea62", "type": "TfsGit", @@ -697,6 +537,7 @@ "clean": "false", "checkoutSubmodules": false }, + "processParameters": {}, "quality": "definition", "queue": { "id": 36, @@ -706,8 +547,8 @@ "name": "DotNet-Build" } }, - "id": 6102, - "name": "Core-Setup-Signing-Windows-BT", + "id": 4371, + "name": "Core-Setup-Windows-Arm-BT", "path": "\\", "type": "build", "project": { diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json index 19737bec..e9680aa4 100644 --- a/buildpipeline/Core-Setup-Windows-BT.json +++ b/buildpipeline/Core-Setup-Windows-BT.json @@ -60,7 +60,44 @@ "enabled": true, "continueOnError": false, "alwaysRun": false, - "displayName": "Build", + "displayName": "Install Signing Plugin", + "timeoutInMinutes": 0, + "task": { + "id": "30666190-6959-11e5-9f96-f56098202fef", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "signType": "$(PB_SignType)", + "zipSources": "false", + "version": "", + "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Run init-tools.cmd", + "timeoutInMinutes": 0, + "task": { + "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\init-tools.cmd", + "arguments": "", + "modifyEnvironment": "false", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Generate version assets", "timeoutInMinutes": 0, "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", @@ -69,11 +106,344 @@ }, "inputs": { "filename": "$(PB_SourcesDirectory)\\build.cmd", - "arguments": "-- $(PB_CommonMSBuildArgs)", + "arguments": "-- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId) $(PB_CommonMSBuildArgs)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build traversal build dependencies", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\build.cmd", + "arguments": "-- $(PB_CommonMSBuildArgs) /t:BuildTraversalBuildDependencies /flp:v=diag", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build binaries", + "timeoutInMinutes": 0, + "task": { + "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "filename": "$(PB_SourcesDirectory)\\build.cmd", + "arguments": "-src-builds -- $(PB_CommonMSBuildArgs)", + "workingFolder": "$(PB_SourcesDirectory)", + "failOnStandardError": "false" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign binaries", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignBinaries $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs)", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build nuget packages", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packages.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build sharedframework layout", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\sharedFramework\\sharedFramework.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\sharedframework.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Create installers", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:BuildInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packaging.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "true", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign MSI and cab", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignMsiAndCab $(PB_CommonMSBuildArgs) $(MsbuildSigningArguments)", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Create bundles", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:BuildCombinedInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\createbundles.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Extract engine from bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:ExtractEngineBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\extractengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign engine", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignEngine $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Reattach engine to bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:ReattachEngineToBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\reattachengine.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Sign Bundle", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\sign.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "/t:SignBundle $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signbundle.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Build and run tests", + "timeoutInMinutes": 0, + "task": { + "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "solution": "$(PB_SourcesDirectory)\\src\\test\\dir.proj", + "platform": "$(PB_TargetArchitecture)", + "configuration": "$(BuildConfiguration)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=diag;LogFile=$(PB_SourcesDirectory)\\tests.log", + "clean": "false", + "maximumCpuCount": "false", + "restoreNugetPackages": "false", + "logProjectEvents": "false", + "createLogFile": "false", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "" + } + }, { "enabled": true, "continueOnError": false, @@ -89,7 +459,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -105,7 +475,7 @@ "enabled": true, "continueOnError": true, "alwaysRun": false, - "displayName": "Clean up VSTS agent", + "displayName": "Cleanup VSTS Agent", "timeoutInMinutes": 0, "task": { "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824", @@ -127,6 +497,38 @@ "msbuildArchitecture": "x64", "msbuildLocation": "" } + }, + { + "enabled": true, + "continueOnError": false, + "alwaysRun": false, + "displayName": "Perform Cleanup Tasks", + "timeoutInMinutes": 0, + "task": { + "id": "521a94ea-9e68-468a-8167-6dcf361ea776", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": {} + }, + { + "enabled": true, + "continueOnError": true, + "alwaysRun": false, + "displayName": "Copy Publish Artifact: Build Logs", + "timeoutInMinutes": 0, + "task": { + "id": "1d341bb0-2106-458c-8422-d00bcea6512a", + "versionSpec": "1.*", + "definitionType": "task" + }, + "inputs": { + "CopyRoot": "", + "Contents": "**\\*.log", + "ArtifactName": "Build Logs", + "ArtifactType": "Container", + "TargetPath": "\\\\my\\share\\$(Build.DefinitionName)\\$(Build.BuildNumber)" + } } ], "options": [ @@ -173,11 +575,13 @@ } ], "variables": { - "GITHUB_PASSWORD": { - "value": "PassedViaPipeBuild" + "BuildConfiguration": { + "value": "Release", + "allowOverride": true }, "COREHOST_TRACE": { - "value": "0" + "value": "0", + "allowOverride": true }, "STORAGE_ACCOUNT": { "value": "dotnetcli" @@ -189,27 +593,54 @@ "value": "PassedViaPipeBuild" }, "PUBLISH_TO_AZURE_BLOB": { - "value": "true", + "value": "true" + }, + "NUGET_FEED_URL": { + "value": "https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v2/package" + }, + "NUGET_API_KEY": { + "value": "PassedViaPipeBuild" + }, + "GITHUB_PASSWORD": { + "value": "PassedViaPipeBuild" + }, + "BUILD_FULL_PLATFORM_MANIFEST": { + "value": "true" + }, + "PUBLISH_RID_AGNOSTIC_PACKAGES": { + "value": "true" + }, + "CertificateId": { + "value": "400" + }, + "PB_DistroRid": { + "value": "win-x64" + }, + "RID": { + "value": "win-x64", "allowOverride": true }, - "BuildConfiguration": { - "value": "Release" + "MsbuildSigningArguments": { + "value": "/p:CertificateId=$(CertificateId) /v:detailed" }, - "PB_CommonMSBuildArgs": { - "value": "/p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) $(PB_AdditionalBuildArguments)" + "TeamName": { + "value": "DotNetCore" + }, + "system.debug": { + "value": "false" }, "PB_PortableBuild": { "value": "false", "allowOverride": true }, - "PB_CleanAgent": { - "value": "true" + "NUGET_SYMBOLS_FEED_URL": { + "value": "https:%2F%2Fdotnet.myget.org/F/dotnet-core/symbols/api/v2/package" }, "PB_SourcesDirectory": { "value": "$(Build.SourcesDirectory)\\core-setup" }, - "PB_Branch": { - "value": "master" + "PB_VsoRepoUrl": { + "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" }, "PB_AzureAccountName": { "value": "sourcebuild" @@ -225,9 +656,6 @@ "value": null, "isSecret": true }, - "PB_VsoRepoUrl": { - "value": "--branch $(PB_Branch) https://$(PB_VsoAccountName):$(PB_VsoPassword)@devdiv.visualstudio.com/DevDiv/_git/DotNet-Core-Setup-Trusted" - }, "PB_VsoAccountName": { "value": "dn-bot" }, @@ -235,9 +663,18 @@ "value": null, "isSecret": true }, + "PB_Branch": { + "value": "master" + }, "SourceVersion": { "value": "HEAD" }, + "PB_SignType": { + "value": "real" + }, + "PB_CommonMSBuildArgs": { + "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" + }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" }, @@ -245,15 +682,18 @@ "value": "x64", "allowOverride": true }, - "PB_AdditionalBuildArguments": { - "value": "", - "allowOverride": true + "PB_CleanAgent": { + "value": "true" + }, + "PB_PublishRidAgnosticPackages": { + "value": "false" + }, + "PB_BuildFullPlatformManifest": { + "value": "false" } }, "demands": [ - "Agent.OS -equals Windows_NT", - "DotNetFramework", - "Cmd" + "Agent.OS -equals Windows_NT" ], "retentionRules": [ { @@ -265,15 +705,15 @@ "FilePath", "SymbolStore" ], - "daysToKeep": 7, + "daysToKeep": 2, "minimumToKeep": 1, "deleteBuildRecord": true, "deleteTestResults": true } ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", + "buildNumberFormat": "$(Date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", - "jobTimeoutInMinutes": 90, + "jobTimeoutInMinutes": 120, "jobCancelTimeoutInMinutes": 5, "badgeEnabled": true, "repository": { @@ -283,7 +723,7 @@ "fetchDepth": "0", "gitLfsSupport": "false", "skipSyncSource": "true", - "cleanOptions": "0" + "cleanOptions": "3" }, "id": "c19ea379-feb7-4ca5-8f7f-5f2b5095ea62", "type": "TfsGit", @@ -293,7 +733,6 @@ "clean": "false", "checkoutSubmodules": false }, - "processParameters": {}, "quality": "definition", "queue": { "id": 36, @@ -303,7 +742,7 @@ "name": "DotNet-Build" } }, - "id": 4371, + "id": 6102, "name": "Core-Setup-Windows-BT", "path": "\\", "type": "build", diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 21bca77f..99a5b6d1 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -61,10 +61,11 @@ } }, { - "Name": "Core-Setup-Windows-BT", + "Name": "Core-Setup-Windows-Arm-BT", "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true", "PB_TargetArchitecture": "arm", + "PB_DistroRid": "win-arm", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -75,10 +76,11 @@ } }, { - "Name": "Core-Setup-Windows-BT", + "Name": "Core-Setup-Windows-Arm-BT", "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr", "PB_TargetArchitecture": "arm64", + "PB_DistroRid": "win-arm64", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -89,7 +91,7 @@ } }, { - "Name": "Core-Setup-Signing-Windows-BT", + "Name": "Core-Setup-Windows-BT", "Parameters": { "PB_DistroRid": "win7-x64", "PB_TargetArchitecture": "x64", @@ -105,7 +107,7 @@ } }, { - "Name": "Core-Setup-Signing-Windows-BT", + "Name": "Core-Setup-Windows-BT", "Parameters": { "PB_DistroRid": "win7-x86", "PB_TargetArchitecture": "x86", @@ -147,4 +149,4 @@ ] } ] -} +} \ No newline at end of file From 69510a3e19506f4b6be34bd7f617f052fae889eb Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 24 May 2017 10:14:01 -0700 Subject: [PATCH 063/198] Ensure we reference NETCoreApp1.1 packages on nca1.1 --- .../Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj | 4 ++-- src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj b/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj index 9a4bda0c..264fb466 100644 --- a/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj +++ b/src/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj @@ -19,9 +19,9 @@ the Microsoft.NETCore.App (RID-agnostic/identity package). --> true - - + + diff --git a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props index 5d2eaa78..2e81d2a5 100644 --- a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props +++ b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props @@ -6,9 +6,11 @@ 1.3.0 + Compile 1.3.0 + Compile 4.3.0 @@ -99,6 +101,7 @@ 4.3.0 + Compile 4.3.0 From 85f23b83eb01c045d325d131de4ebaf0d460e8d7 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 24 May 2017 10:43:31 -0700 Subject: [PATCH 064/198] Update NETCoreApp dependencies to account for servicing --- .../Microsoft.NETCore.App/netcoreapp1.0.props | 17 +++++++++++++---- .../Microsoft.NETCore.App/netcoreapp1.1.props | 16 +++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props index adfeb707..fd7843f3 100644 --- a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props +++ b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.0.props @@ -13,10 +13,13 @@ 4.0.1 - 1.0.1 + 1.0.5 + + + 1.0.2 - 1.0.4 + 1.0.7 10.0.1 @@ -24,6 +27,9 @@ 1.6.0 + + 4.0.1 + 4.0.0 @@ -58,7 +64,7 @@ 4.0.1 - 4.1.0 + 4.1.1 4.0.1 @@ -66,6 +72,9 @@ 4.0.1 + + 4.1.2 + 4.0.0 @@ -73,7 +82,7 @@ 4.0.11 - 4.0.0 + 4.0.1 4.0.1 diff --git a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props index 2e81d2a5..f18acc68 100644 --- a/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props +++ b/src/pkg/projects/Microsoft.NETCore.App/netcoreapp1.1.props @@ -16,13 +16,13 @@ 4.3.0 - 1.4.0 + 1.4.1 - 1.1.0 + 1.1.2 - 1.1.0 + 1.1.2 10.1.0 @@ -30,6 +30,9 @@ 1.6.1 + + 4.3.1 + 4.3.0 @@ -43,7 +46,7 @@ 4.3.0 - 4.3.0 + 4.3.1 4.3.0 @@ -72,6 +75,9 @@ 4.3.0 + + 4.3.2 + 4.3.0 @@ -79,7 +85,7 @@ 4.3.0 - 4.3.0 + 4.3.1 4.3.0 From f3abf93e9546f56cafe16acd00e64f1482a868b6 Mon Sep 17 00:00:00 2001 From: Vivek Mishra Date: Wed, 24 May 2017 17:17:48 -0700 Subject: [PATCH 065/198] Port of RPM package building changes from PR #2462 (#2483) * Port of RPM packaging changes from PR #2462 * Port of RPM packaging changes from PR #2462 * Removed the publish RID for Centos * Updated the Changelog template as pre review comments * Update the description and summary for SF to comply with char limits * Update the description and summary for SF to comply with char limits * Format installer and archive file name per new guidelines (#2461) * format installer and archive file name per new guidelines * Updated the installer and compressed files per feedback. Also, taking care of extra space in Brand name. * Port of fix #2517-Core-Setup-Linux-BT definition to have PortableBuild=false --- README.md | 8 +- dir.props | 40 ++- publish/dir.props | 1 + .../deb/dotnet-sharedhost-debian_config.json | 2 +- src/pkg/packaging/dir.proj | 2 + .../rpm/dotnet-hostfxr-rpm_config.json | 42 +++ .../dotnet-sharedframework-rpm_config.json | 49 +++ .../rpm/dotnet-sharedhost-rpm_config.json | 45 +++ src/pkg/packaging/rpm/package.props | 15 + src/pkg/packaging/rpm/package.targets | 293 ++++++++++++++++ .../rpm/scripts/after_install_host.sh | 7 + .../rpm/scripts/after_remove_host.sh | 7 + src/pkg/packaging/rpm/templates/changelog | 2 + src/pkg/packaging/rpm/templates/copyright | 8 + tools-local/tasks/BuildFPMToolPreReqs .cs | 318 ++++++++++++++++++ 15 files changed, 825 insertions(+), 14 deletions(-) create mode 100644 src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json create mode 100644 src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json create mode 100644 src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json create mode 100644 src/pkg/packaging/rpm/package.props create mode 100644 src/pkg/packaging/rpm/package.targets create mode 100644 src/pkg/packaging/rpm/scripts/after_install_host.sh create mode 100644 src/pkg/packaging/rpm/scripts/after_remove_host.sh create mode 100644 src/pkg/packaging/rpm/templates/changelog create mode 100644 src/pkg/packaging/rpm/templates/copyright create mode 100644 tools-local/tasks/BuildFPMToolPreReqs .cs diff --git a/README.md b/README.md index a87548e0..47cea247 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ Daily Builds | **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-master]][ubuntu-16.10-version-master]
[Host][ubuntu-16.10-host-master]
[Host FX Resolver][ubuntu-16.10-hostfxr-master]
[Shared Framework][ubuntu-16.10-sharedfx-master]
| [![][ubuntu-16.10-badge-1.1.X]][ubuntu-16.10-version-1.1.X]
[Host][ubuntu-16.10-host-1.1.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.10-sharedfx-1.1.X]
[tar.gz][ubuntu-16.10-targz-1.1.X] | N/A | | **Debian 8.2 (x64)** | [![][debian-8.2-badge-master]][debian-8.2-version-master]
[Host][debian-8.2-host-master]
[Host FX Resolver][debian-8.2-hostfxr-master]
[Shared Framework][debian-8.2-sharedfx-master]
| [![][debian-8.2-badge-1.1.X]][debian-8.2-version-1.1.X]
[Host][debian-8.2-host-1.1.X]
[Host FX Resolver][debian-8.2-hostfxr-1.1.X]
[Shared Framework][debian-8.2-sharedfx-1.1.X]
[tar.gz][debian-8.2-targz-1.1.X] | [![][debian-8.2-badge-preview]][debian-8.2-version-preview]
[Host][debian-8.2-host-preview]
[Host FX Resolver][debian-8.2-hostfxr-preview]
[Shared Framework][debian-8.2-sharedfx-preview]
[tar.gz][debian-8.2-targz-preview] | | **CentOS 7.1 (x64)** | N/A | [![][centos-badge-1.1.X]][centos-version-1.1.X]
[tar.gz][centos-targz-1.1.X] | [![][centos-badge-preview]][centos-version-preview]
[tar.gz][centos-targz-preview] | -| **RHEL 7.2 (x64)** | N/A | [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] | +| **RHEL 7.2 (x64)** | [![][rhel7-badge-master]][rhel7-version-master]
[Host][rhel7-host-master]
[Host FX Resolver][rhel7-hostfxr-master]
[Shared Framework][rhel7-sharedfx-master]
| [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] | | **Fedora 23 (x64)** | N/A | [![][fedora-23-badge-1.1.X]][fedora-23-version-1.1.X]
[tar.gz][fedora-23-targz-1.1.X] | [![][fedora-23-badge-preview]][fedora-23-version-preview]
[tar.gz][fedora-23-targz-preview] | | **Fedora 24 (x64)** | N/A | [![][fedora-24-badge-1.1.X]][fedora-24-version-1.1.X]
[tar.gz][fedora-24-targz-1.1.X] | N/A | | **OpenSUSE 42.1 (x64)** | N/A | [![][opensuse-42.1-badge-1.1.X]][opensuse-42.1-version-1.1.X]
[tar.gz][opensuse-42.1-targz-1.1.X] | N/A | @@ -216,6 +216,12 @@ Daily Builds [centos-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz +[rhel7-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_rhel.7-x64_Release_version_badge.svg +[rhel7-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.rhel.7.x64.version +[rhel7-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-rhel.7-x64.latest.rpm +[rhel7-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-rhel.7-x64.latest.rpm +[rhel7-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-rhel.7-x64.latest.rpm + [rhel-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg [rhel-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.rhel.x64.version [rhel-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz diff --git a/dir.props b/dir.props index 9f51603c..71a57ca9 100644 --- a/dir.props +++ b/dir.props @@ -279,16 +279,6 @@ $(BaseOutputRootPath)sharedfx_$(TargetRid)_$(ConfigurationGroup)_version_badge.svg - - .zip - .tar.gz - .msi - .pkg - .deb - .exe - $(InstallerExtension) - - $(PackagesOutDir)dotnet-runtime- $(PackagesOutDir)dotnet-host- @@ -324,6 +314,8 @@ false false false + false + false @@ -351,6 +343,20 @@ true + + + true + true + true + + + + + true + true + true + + true @@ -359,6 +365,17 @@ + + .zip + .tar.gz + .msi + .pkg + .deb + .rpm + .exe + $(InstallerExtension) + + @@ -371,8 +388,7 @@ true - - + \ No newline at end of file diff --git a/publish/dir.props b/publish/dir.props index 8f739f8d..cc777ea6 100644 --- a/publish/dir.props +++ b/publish/dir.props @@ -48,5 +48,6 @@ + diff --git a/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json index e144623a..9b14a615 100644 --- a/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json +++ b/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json @@ -13,7 +13,7 @@ "package_version":"1.0.0.0", "package_revision":"1", "urgency" : "low", - "changelog_message" : "Inital shared host." + "changelog_message" : "Initial shared host." }, "control": { diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index c78e4133..d009bd59 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -143,6 +143,7 @@ + @@ -150,6 +151,7 @@ GenerateBundles; GeneratePkgs; GenerateDebs; + GenerateRpms; diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json new file mode 100644 index 00000000..a3caefff --- /dev/null +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -0,0 +1,42 @@ +{ + "maintainer_name": "Microsoft", + "maintainer_email": "dotnetcore@microsoft.com", + + "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", + "install_root": "/usr/share/dotnet", + "install_doc": "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%/", + + "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", + "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", + "homepage": "https://github.com/dotnet/core", + + "release":{ + "package_version":"1.0.0.0", + "package_revision":"1", + "urgency" : "low", + "changelog_message" : "Versioned Hostfxr" + }, + + "control": { + "priority":"standard", + "section":"libs", + "architecture":"amd64" + }, + + "copyright": "2015 Microsoft", + + "license": { + "type": "MIT", + "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." + }, + + "rpm_dependencies": [{ + "package_name": "dotnet-host", + "package_version": "%SHARED_HOST_RPM_VERSION%" + }], + + "directories" : [ + "/usr/share/dotnet/host", + "/usr/share/doc/%HOSTFXR_RPM_PACKAGE_NAME%" + ] +} \ No newline at end of file diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json new file mode 100644 index 00000000..0a7ef7b2 --- /dev/null +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -0,0 +1,49 @@ +{ + "maintainer_name":"Microsoft", + "maintainer_email": "dotnetcore@microsoft.com", + + "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", + "install_root": "/usr/share/dotnet", + "install_doc": "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%/", + + "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME%", + "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", + "homepage": "https://github.com/dotnet/core", + + "release":{ + "package_version":"1.0.0.0", + "package_revision":"1", + "urgency" : "low", + "changelog_message" : "Initial shared framework." + }, + + "control": { + "priority":"standard", + "section":"libs", + "architecture":"amd64" + }, + + "copyright": "2015 Microsoft", + "license": { + "type": "MIT", + "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." + }, + + "rpm_dependencies": [{ + "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", + "package_version": "" + }, + { + "package_name": "openssl-libs", + "package_version": "" + }, + { + "package_name": "libcurl", + "package_version": "" + }], + + "directories" : [ + "/usr/share/dotnet/shared", + "/usr/share/doc/%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%" + ] +} \ No newline at end of file diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json new file mode 100644 index 00000000..fc2ce896 --- /dev/null +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -0,0 +1,45 @@ +{ + "maintainer_name":"Microsoft", + "maintainer_email": "dotnetcore@microsoft.com", + + "package_name": "dotnet-host", + "install_root": "/usr/share/dotnet", + "install_doc": "/usr/share/doc/dotnet-host/", + "install_man": "/usr/share/man/man1", + + "short_description": "%SHARED_HOST_BRAND_NAME%", + "long_description": ".NET Core is a development platform that you can use to build command-line\napplications, microservices and modern websites. It is open source,\ncross-platform and is supported by Microsoft. We hope you enjoy using it!\nIf you do, please consider joining the active community of developers that are\ncontributing to the project on GitHub (https://github.com/dotnet/core).\nWe happily accept issues and PRs.", + "homepage": "https://github.com/dotnet/core", + + "release":{ + "package_version":"1.0.0.0", + "package_revision":"1", + "urgency" : "low", + "changelog_message" : "Initial shared host." + }, + + "control": { + "priority":"standard", + "section":"libs", + "architecture":"amd64" + }, + + "copyright": "2015 Microsoft", + "license": { + "type": "MIT", + "full_text": "Copyright (c) 2015 Microsoft\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE." + }, + + "package_conflicts" : [ + "dotnet", + "dotnet-nightly" + ], + + "directories" : [ + "/usr/share/dotnet", + "/usr/share/doc/dotnet-host" + ], + + "after_install_source": "scripts/after_install_host.sh", + "after_remove_source": "scripts/after_remove_host.sh" +} \ No newline at end of file diff --git a/src/pkg/packaging/rpm/package.props b/src/pkg/packaging/rpm/package.props new file mode 100644 index 00000000..3bef4e46 --- /dev/null +++ b/src/pkg/packaging/rpm/package.props @@ -0,0 +1,15 @@ + + + + rpm_config.json + $(PackagingRoot)rpm/ + dotnet-host + $(SharedHostRpmPkgName.ToLower()) + dotnet-hostfxr-$(HostResolverVersion) + $(HostFxrRpmPkgName.ToLower()) + dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkNugetVersion) + $(SharedFxRpmPkgName.ToLower()) + $(MSBuildThisFileDirectory)/templates + $(MSBuildThisFileDirectory)/scripts + + \ No newline at end of file diff --git a/src/pkg/packaging/rpm/package.targets b/src/pkg/packaging/rpm/package.targets new file mode 100644 index 00000000..347d5c17 --- /dev/null +++ b/src/pkg/packaging/rpm/package.targets @@ -0,0 +1,293 @@ + + + + + + + + + true + true + + + + + + + + + $(SharedHostRpmPkgName) + $(HostVersion) + $(SharedHostPublishRoot) + $(SharedHostInstallerFile) + $(ProjectDir)Documentation/manpages + dotnet-sharedhost-rpm_config.json + $(rpmPackagingConfigPath)$(ConfigJsonName) + $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) + + + + $(RpmIntermediatesDir)/rpmLayoutDirectory/ + $(rpmLayoutDirectory)package_root + $(rpmLayoutDirectory)docs + $(rpmLayoutDirectory)templates + $(rpmLayoutDirectory)scripts + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SharedHostBrandName) + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(HostFxrRpmPkgName) + $(HostResolverVersion) + $(HostFxrPublishRoot) + $(HostFxrInstallerFile) + dotnet-hostfxr-rpm_config.json + $(rpmPackagingConfigPath)$(ConfigJsonName) + $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) + + + + $(RpmIntermediatesDir)/rpmLayoutDirectory/ + $(rpmLayoutDirectory)package_root + $(rpmLayoutDirectory)docs + $(rpmLayoutDirectory)templates + + + + + + + + + + + + + + + + + + + + + + + + + $(HostFxrBrandName) + + + $(HostVersion) + + + $(HostResolverVersion) + + + $(RpmPackageName) + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SharedFxRpmPkgName) + $(SharedFrameworkNugetVersion) + $(SharedFrameworkPublishRoot) + $(SharedFrameworkInstallerFile) + dotnet-sharedframework-rpm_config.json + $(rpmPackagingConfigPath)$(ConfigJsonName) + $(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion) + + + + $(RpmIntermediatesDir)/rpmLayoutDirectory/ + $(rpmLayoutDirectory)package_root + $(rpmLayoutDirectory)docs + $(rpmLayoutDirectory)templates + + + + + + + + + + + + + + + + + + + + + + + + + $(HostFxrRpmPkgName) + + + $(SharedFxRpmPkgName) + + + $(SharedFrameworkName) + + + $(SharedFrameworkNugetVersion) + + + $(SharedFrameworkBrandName) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + true + + + + + + \ No newline at end of file diff --git a/src/pkg/packaging/rpm/scripts/after_install_host.sh b/src/pkg/packaging/rpm/scripts/after_install_host.sh new file mode 100644 index 00000000..9943b1be --- /dev/null +++ b/src/pkg/packaging/rpm/scripts/after_install_host.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# +echo "Creating dotnet host symbolic link: /usr/bin/dotnet" +ln -sf "/usr/share/dotnet/dotnet" "/usr/bin/dotnet" \ No newline at end of file diff --git a/src/pkg/packaging/rpm/scripts/after_remove_host.sh b/src/pkg/packaging/rpm/scripts/after_remove_host.sh new file mode 100644 index 00000000..e0bb6b5b --- /dev/null +++ b/src/pkg/packaging/rpm/scripts/after_remove_host.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# +echo "Removing dotnet host symbolic link" +unlink /usr/bin/dotnet diff --git a/src/pkg/packaging/rpm/templates/changelog b/src/pkg/packaging/rpm/templates/changelog new file mode 100644 index 00000000..e61dbc60 --- /dev/null +++ b/src/pkg/packaging/rpm/templates/changelog @@ -0,0 +1,2 @@ +* {DATE} {MAINTAINER_NAME} <{MAINTAINER_EMAIL}> - {PACKAGE_VERSION}-{PACKAGE_REVISION} +- {CHANGELOG_MESSAGE} diff --git a/src/pkg/packaging/rpm/templates/copyright b/src/pkg/packaging/rpm/templates/copyright new file mode 100644 index 00000000..a336435d --- /dev/null +++ b/src/pkg/packaging/rpm/templates/copyright @@ -0,0 +1,8 @@ +Comment: Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information. + +Files: * +Copyright: {COPYRIGHT_TEXT} +License: {LICENSE_NAME} + +License: {LICENSE_NAME} + {LICENSE_TEXT} \ No newline at end of file diff --git a/tools-local/tasks/BuildFPMToolPreReqs .cs b/tools-local/tasks/BuildFPMToolPreReqs .cs new file mode 100644 index 00000000..031b4f44 --- /dev/null +++ b/tools-local/tasks/BuildFPMToolPreReqs .cs @@ -0,0 +1,318 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; +using System.Collections.Generic; +using Microsoft.Build.Utilities; +using Microsoft.Build.Framework; +using System.IO; +using System.Linq; +using System.Text; +using Newtonsoft.Json; + +namespace Microsoft.DotNet.Build.Tasks +{ + /// + /// This task prepares the command line parameters for running a RPM build using FPM tool and also updates the copyright and changelog file tokens. + /// If parses various values from the config json by first reading it into a model and then builds the required string for parameters and passes it back. + /// + /// + public class BuildFPMToolPreReqs : BuildTask + { + [Required] + public string InputDir { get; set; } + [Required] + public string OutputDir { get; set; } + [Required] + public string PackageVersion { get; set; } + [Required] + public string ConfigJsonFile { get; set; } + [Output] + public string FPMParameters { get; set; } + + public override bool Execute() + { + try + { + if (!File.Exists(ConfigJsonFile)) + { + throw new FileNotFoundException($"Expected file {ConfigJsonFile} was not found."); + } + + // Open the Config Json and read the values into the model + TextReader projectFileReader = File.OpenText(ConfigJsonFile); + if (projectFileReader != null) + { + string jsonFileText = projectFileReader.ReadToEnd(); + ConfigJson configJson = JsonConvert.DeserializeObject(jsonFileText); + + // Update the Changelog and Copyright files by replacing tokens with values from config json + UpdateChangelog(configJson, PackageVersion); + UpdateCopyRight(configJson); + + // Build the full list of parameters + FPMParameters = BuildCmdParameters(configJson, PackageVersion); + Log.LogMessage(MessageImportance.Normal, "Generated RPM paramters: " + FPMParameters); + } + else + { + throw new IOException($"Could not open the file {ConfigJsonFile} for reading."); + } + } + catch (Exception e) + { + Log.LogError("Exception while processing RPM paramters: " + e.Message); + } + + return !Log.HasLoggedErrors; + } + + // Update the tokens in the changelog file from the config Json + private void UpdateChangelog(ConfigJson configJson, string package_version) + { + try + { + string changelogFile = Path.Combine(InputDir, "templates", "changelog"); + if (!File.Exists(changelogFile)) + { + throw new FileNotFoundException($"Expected file {changelogFile} was not found."); + } + string str = File.ReadAllText(changelogFile); + str = str.Replace("{PACKAGE_NAME}", configJson.Package_Name); + str = str.Replace("{PACKAGE_VERSION}", package_version); + str = str.Replace("{PACKAGE_REVISION}", configJson.Release.Package_Revision); + str = str.Replace("{URGENCY}", configJson.Release.Urgency); + str = str.Replace("{CHANGELOG_MESSAGE}", configJson.Release.Changelog_Message); + str = str.Replace("{MAINTAINER_NAME}", configJson.Maintainer_Name); + str = str.Replace("{MAINTAINER_EMAIL}", configJson.Maintainer_Email); + // The date format needs to be like Wed May 17 2017 + str = str.Replace("{DATE}", DateTime.UtcNow.ToString("ddd MMM dd yyyy")); + File.WriteAllText(changelogFile, str); + } + catch (Exception e) + { + Log.LogError("Exception while updating the changelog file: " + e.Message); + } + } + + public void UpdateCopyRight(ConfigJson configJson) + { + try + { + // Update the tokens in the copyright file from the config Json + string copyrightFile = Path.Combine(InputDir, "templates", "copyright"); + if (!File.Exists(copyrightFile)) + { + throw new FileNotFoundException($"Expected file {copyrightFile} was not found."); + } + string str = File.ReadAllText(copyrightFile); + str = str.Replace("{COPYRIGHT_TEXT}", configJson.CopyRight); + str = str.Replace("{LICENSE_NAME}", configJson.License.Type); + str = str.Replace("{LICENSE_NAME}", configJson.License.Type); + str = str.Replace("{LICENSE_TEXT}", configJson.License.Full_Text); + File.WriteAllText(copyrightFile, str); + } + catch (Exception e) + { + Log.LogError("Exception while updating the copyright file: " + e.Message); + } + } + + private string BuildCmdParameters(ConfigJson configJson, string package_version) + { + // Parameter list that needs to be passed to FPM tool: + // -s : is the input source type(dir) --Static + // -t : is the type of package(rpm) --Static + // -n : is for the name of the package --JSON + // -v : is the version to give to the package --ARG + // -a : architecture --JSON + // -d : is for all dependent packages. This can be used multiple times to specify the dependencies of the package. --JSON + // --rpm-os : the operating system to target this rpm --Static + // --rpm-changelog : the changelog from FILEPATH contents --ARG + // --rpm-summary : it is the RPM summary that shows in the Title --JSON + // --description : it is the description for the package --JSON + // -p : The actual package name (with path) for your package. --ARG+JSON + // --conflicts : Other packages/versions this package conflicts with provided as CSV --JSON + // --directories : Recursively add directories as being owned by the package. --JSON + // --after-install : FILEPATH to the script to be run after install of the package --JSON + // --after-remove : FILEPATH to the script to be run after package removal --JSON + // --license : the licensing name for the package. This will include the license type in the meta-data for the package, but will not include the associated license file within the package itself. --JSON + // --iteration : the iteration to give to the package. This comes from the package_revision --JSON + // --url : url for this package. --JSON + // --verbose : Set verbose output for FPM tool --Static + // : Add all the folder mappings for packge_root, docs, man pages --Static + + var parameters = new List(); + parameters.Add("-s dir"); + parameters.Add("-t rpm"); + parameters.Add(string.Concat("-n ", configJson.Package_Name)); + parameters.Add(string.Concat("-v ", package_version)); + parameters.Add(string.Concat("-a ", configJson.Control.Architecture)); + + // Build the list of dependencies as -d -d + if (configJson.Rpm_Dependencies != null) + { + foreach (RpmDependency rpmdep in configJson.Rpm_Dependencies) + { + string dependency = ""; + if (rpmdep.Package_Name != "") + { + // If no version is specified then the dependency is just the package without >= check + if (rpmdep.Package_Version == "") + { + dependency = rpmdep.Package_Name; + } + else + { + dependency = string.Concat(rpmdep.Package_Name, " >= ", rpmdep.Package_Version); + } + } + if (dependency != "") parameters.Add(string.Concat("-d ", EscapeArg(dependency))); + } + } + + // Build the list of owned directories + if (configJson.Directories != null) + { + foreach (string dir in configJson.Directories) + { + if (dir != "") + { + parameters.Add(string.Concat("--directories ", EscapeArg(dir))); + } + } + } + + parameters.Add("--rpm-os linux"); + parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File + parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); + parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); + parameters.Add(string.Concat("--maintainer ", configJson.Maintainer_Name)); + parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); + if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts)))); + if (configJson.After_Install_Source != null) parameters.Add(string.Concat("--after-install ", Path.Combine(InputDir, EscapeArg(configJson.After_Install_Source)))); + if (configJson.After_Remove_Source != null) parameters.Add(string.Concat("--after-remove ", Path.Combine(InputDir, EscapeArg(configJson.After_Remove_Source)))); + parameters.Add(string.Concat("--license ", EscapeArg(configJson.License.Type))); + parameters.Add(string.Concat("--iteration ", configJson.Release.Package_Revision)); + parameters.Add(string.Concat("--url ", "\"", EscapeArg(configJson.Homepage), "\"")); + parameters.Add("--verbose"); + + // Map all the payload directories as they need to install on the system + if (configJson.Install_Root != null) parameters.Add(string.Concat(Path.Combine(InputDir, "package_root/="), configJson.Install_Root)); // Package Files + if (configJson.Install_Man != null) parameters.Add(string.Concat(Path.Combine(InputDir, "docs", "host/="), configJson.Install_Man)); // Man Pages + if (configJson.Install_Doc != null) parameters.Add(string.Concat(Path.Combine(InputDir, "templates", "copyright="), configJson.Install_Doc)); // CopyRight File + + return string.Join(" ", parameters); + } + + private string EscapeArg(string arg) + { + var sb = new StringBuilder(); + + bool quoted = ShouldSurroundWithQuotes(arg); + if (quoted) sb.Append("\""); + + for (int i = 0; i < arg.Length; ++i) + { + var backslashCount = 0; + + // Consume All Backslashes + while (i < arg.Length && arg[i] == '\\') + { + backslashCount++; + i++; + } + + // Escape any backslashes at the end of the arg + // This ensures the outside quote is interpreted as + // an argument delimiter + if (i == arg.Length) + { + sb.Append('\\', 2 * backslashCount); + } + + // Escape any preceding backslashes and the quote + else if (arg[i] == '"') + { + sb.Append('\\', (2 * backslashCount) + 1); + sb.Append('"'); + } + + // Output any consumed backslashes and the character + else + { + sb.Append('\\', backslashCount); + sb.Append(arg[i]); + } + } + + if (quoted) sb.Append("\""); + + return sb.ToString(); + } + private bool ShouldSurroundWithQuotes(string argument) + { + // Don't quote already quoted strings + if (argument.StartsWith("\"", StringComparison.Ordinal) && + argument.EndsWith("\"", StringComparison.Ordinal)) + { + return false; + } + + // Only quote if whitespace exists in the string + if (argument.Contains(" ") || argument.Contains("\t") || argument.Contains("\n")) + { + return true; + } + return false; + } + } + + /// + /// Model classes for reading and storing the JSON. + /// + public class ConfigJson + { + public string Maintainer_Name { get; set; } + public string Maintainer_Email { get; set; } + public string Package_Name { get; set; } + public string Install_Root { get; set; } + public string Install_Doc { get; set; } + public string Install_Man { get; set; } + public string Short_Description { get; set; } + public string Long_Description { get; set; } + public string Homepage { get; set; } + public string CopyRight { get; set; } + public Release Release { get; set; } + public Control Control { get; set; } + public License License { get; set; } + public List Rpm_Dependencies { get; set; } + public List Package_Conflicts { get; set; } + public List Directories { get; set; } + public string After_Install_Source { get; set; } + public string After_Remove_Source { get; set; } + } + public class Release + { + public string Package_Version { get; set; } + public string Package_Revision { get; set; } + public string Urgency { get; set; } + public string Changelog_Message { get; set; } + } + public class Control + { + public string Priority { get; set; } + public string Section { get; set; } + public string Architecture { get; set; } + } + public class License + { + public string Type { get; set; } + public string Full_Text { get; set; } + } + public class RpmDependency + { + public string Package_Name { get; set; } + public string Package_Version { get; set; } + } +} From 2e81eddc47062087bacfb0c93525ec943ac029bc Mon Sep 17 00:00:00 2001 From: chcosta Date: Thu, 25 May 2017 09:50:58 -0700 Subject: [PATCH 066/198] Remove unecessary generateversionsourcefile and init-tools steps from (#2514) (#2532) offical build definitions --- buildpipeline/Core-Setup-Linux-Arm-BT.json | 57 ++---- buildpipeline/Core-Setup-Linux-BT.json | 89 ++------- buildpipeline/Core-Setup-OSX-BT.json | 51 ++--- buildpipeline/Core-Setup-Windows-Arm-BT.json | 119 +++++------- buildpipeline/Core-Setup-Windows-BT.json | 187 ++++++++----------- 5 files changed, 172 insertions(+), 331 deletions(-) diff --git a/buildpipeline/Core-Setup-Linux-Arm-BT.json b/buildpipeline/Core-Setup-Linux-Arm-BT.json index f5421fbd..6457d98a 100644 --- a/buildpipeline/Core-Setup-Linux-Arm-BT.json +++ b/buildpipeline/Core-Setup-Linux-Arm-BT.json @@ -110,42 +110,6 @@ "failOnStandardError": "false" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Init tools", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/init-tools.sh", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, { "enabled": true, "continueOnError": false, @@ -239,6 +203,16 @@ } ], "options": [ + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + }, { "enabled": false, "definition": { @@ -388,10 +362,10 @@ "isSecret": true }, "PB_DistroRid": { - "value": "ubuntu.14.04-x64" + "value": "ubuntu.14.04-arm" }, "PB_TargetArchitecture": { - "value": "x64" + "value": "arm" }, "PB_AdditionalBuildArguments": { "value": "" @@ -432,7 +406,7 @@ "deleteTestResults": true } ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(PB_DockerTag)", + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", "jobTimeoutInMinutes": 90, "jobCancelTimeoutInMinutes": 5, @@ -474,6 +448,7 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097676 + "revision": 418097676, + "visibility": "private" } -} +} \ No newline at end of file diff --git a/buildpipeline/Core-Setup-Linux-BT.json b/buildpipeline/Core-Setup-Linux-BT.json index 3ef95c84..a6af5ac6 100644 --- a/buildpipeline/Core-Setup-Linux-BT.json +++ b/buildpipeline/Core-Setup-Linux-BT.json @@ -110,42 +110,6 @@ "failOnStandardError": "false" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Init tools", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/init-tools.sh", - "workingFolder": "", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId)", - "workingFolder": "", - "failOnStandardError": "false" - } - }, { "enabled": true, "continueOnError": false, @@ -188,7 +152,6 @@ "alwaysRun": false, "displayName": "Copy built Portable binaries to staging directory", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "5bfb729a-a7c8-4a78-a7c3-8d717bb7c13c", "versionSpec": "2.*", @@ -209,7 +172,6 @@ "alwaysRun": false, "displayName": "Initialize docker - Ubuntu14.04", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -228,7 +190,6 @@ "alwaysRun": false, "displayName": "Init tools - Ubuntu14.04", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -247,7 +208,6 @@ "alwaysRun": false, "displayName": "Build traversal build dependencies - Ubuntu 14.04", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -266,7 +226,6 @@ "alwaysRun": false, "displayName": "Package - Ubuntu 14.04 ", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -285,7 +244,6 @@ "alwaysRun": false, "displayName": "Publish - Ubuntu 14.04 ", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -304,7 +262,6 @@ "alwaysRun": false, "displayName": "Initialize docker - Ubuntu16.04", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -323,7 +280,6 @@ "alwaysRun": false, "displayName": "Init tools - Ubuntu16.04 ", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -342,7 +298,6 @@ "alwaysRun": false, "displayName": "Build traversal build dependencies -Ubuntu 16.04 ", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -361,7 +316,6 @@ "alwaysRun": false, "displayName": "Package - Ubuntu 16.04", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -380,7 +334,6 @@ "alwaysRun": false, "displayName": "Publish - Ubuntu 16.04 ", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -399,7 +352,6 @@ "alwaysRun": false, "displayName": "Initialize docker - Ubuntu16.10", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -418,7 +370,6 @@ "alwaysRun": false, "displayName": "Init tools - Ubuntu16.10", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -437,7 +388,6 @@ "alwaysRun": false, "displayName": "Build traversal build dependencies - Ubuntu 16.10", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -456,7 +406,6 @@ "alwaysRun": false, "displayName": "Package - Ubuntu 16.10", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -475,7 +424,6 @@ "alwaysRun": false, "displayName": "Publish - Ubuntu 16.10", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -494,7 +442,6 @@ "alwaysRun": false, "displayName": "Initialize docker - Debian 8", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -513,7 +460,6 @@ "alwaysRun": false, "displayName": "Init tools - Debian 8 container", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -532,7 +478,6 @@ "alwaysRun": false, "displayName": "Build traversal build dependencies - Debian 8", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -551,7 +496,6 @@ "alwaysRun": false, "displayName": "Package - Debian 8", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -570,7 +514,6 @@ "alwaysRun": false, "displayName": "Publish - Debian 8", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -589,7 +532,6 @@ "alwaysRun": false, "displayName": "Initialize docker - Rhel7", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -608,7 +550,6 @@ "alwaysRun": false, "displayName": "Init tools - Rhel7", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -627,7 +568,6 @@ "alwaysRun": false, "displayName": "Build traversal build dependencies - Rhel7", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -646,7 +586,6 @@ "alwaysRun": false, "displayName": "Package - Rhel7", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -665,7 +604,6 @@ "alwaysRun": false, "displayName": "Publish - Rhel7", "timeoutInMinutes": 0, - "condition": "succeeded()", "task": { "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", "versionSpec": "1.*", @@ -735,6 +673,16 @@ } ], "options": [ + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + }, { "enabled": false, "definition": { @@ -891,7 +839,7 @@ "isSecret": true }, "PB_DistroRid": { - "value": "ubuntu.14.04-x64" + "value": "ubuntu.14.04-$(PB_TargetArchitecture)" }, "PB_TargetArchitecture": { "value": "x64" @@ -936,7 +884,7 @@ "value": "ubuntu-16.04-debpkg-e5cf912-20174703024721" }, "DistroRid_Ubuntu1604": { - "value": "ubuntu.16.04-x64" + "value": "ubuntu.16.04-$(PB_TargetArchitecture)" }, "DockerImageName_Ubuntu1604": { "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1604)" @@ -948,7 +896,7 @@ "value": "ubuntu-16.10-debpkg-ec863bb-20170003030028" }, "DistroRid_Ubuntu1610": { - "value": "ubuntu.16.10-x64" + "value": "ubuntu.16.10-$(PB_TargetArchitecture)" }, "DockerImageName_Ubuntu1610": { "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1610)" @@ -960,7 +908,7 @@ "value": "debian-8.2-debpkg-9f87c3c-20173003023006" }, "DistroRid_Debian8": { - "value": "debian.8-x64" + "value": "debian.8-$(PB_TargetArchitecture)" }, "DockerImageName_Debian8": { "value": "$(PB_DockerRepository):$(DockerTag_Debian8)" @@ -972,7 +920,7 @@ "value": "rhel-7-rpmpkg-c982313-20174116044113" }, "DistroRid_Rhel7": { - "value": "rhel.7-x64" + "value": "rhel.7-$(PB_TargetArchitecture)" }, "DockerImageName_Rhel7": { "value": "$(PB_DockerRepository):$(DockerTag_Rhel7)" @@ -1010,7 +958,7 @@ "deleteTestResults": true } ], - "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)-$(PB_DockerTag)", + "buildNumberFormat": "$(date:yyyyMMdd)$(rev:-rr)", "jobAuthorizationScope": "projectCollection", "jobTimeoutInMinutes": 90, "jobCancelTimeoutInMinutes": 5, @@ -1052,6 +1000,7 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097676 + "revision": 418097676, + "visibility": "private" } -} +} \ No newline at end of file diff --git a/buildpipeline/Core-Setup-OSX-BT.json b/buildpipeline/Core-Setup-OSX-BT.json index c7bdbcf9..7872962e 100644 --- a/buildpipeline/Core-Setup-OSX-BT.json +++ b/buildpipeline/Core-Setup-OSX-BT.json @@ -54,42 +54,6 @@ "failOnStandardError": "false" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Init tools", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)/init-tools.sh", - "arguments": "", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)/Tools/msbuild.sh", - "arguments": "$(PB_SourcesDirectory)/build.proj /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId)", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, { "enabled": true, "continueOnError": false, @@ -146,6 +110,16 @@ } ], "options": [ + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + }, { "enabled": false, "definition": { @@ -316,6 +290,7 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097676 + "revision": 418097676, + "visibility": "private" } -} +} \ No newline at end of file diff --git a/buildpipeline/Core-Setup-Windows-Arm-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json index 1fb49947..c6d0e975 100644 --- a/buildpipeline/Core-Setup-Windows-Arm-BT.json +++ b/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -74,43 +74,6 @@ "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run init-tools.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)\\init-tools.cmd", - "arguments": "", - "modifyEnvironment": "false", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)\\build.cmd", - "arguments": "-- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId) $(PB_CommonMSBuildArgs)", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, { "enabled": true, "continueOnError": false, @@ -160,6 +123,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\sign.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:SignBinaries $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs)", @@ -167,11 +134,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -187,6 +150,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packages.log", @@ -194,11 +161,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -214,6 +177,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\sharedFramework\\sharedFramework.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\sharedframework.log", @@ -221,11 +188,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -241,6 +204,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packaging.log", @@ -248,11 +215,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "true", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "true" } }, { @@ -268,6 +231,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", @@ -275,11 +242,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -295,6 +258,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\Tools\\scripts\\vstsagent\\cleanupagent.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", @@ -302,11 +269,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -343,6 +306,16 @@ } ], "options": [ + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + }, { "enabled": false, "definition": { @@ -419,10 +392,7 @@ "value": "400" }, "PB_DistroRid": { - "value": "win-x64" - }, - "RID": { - "value": "win-x64", + "value": "win-$(PB_TargetArchitecture)", "allowOverride": true }, "MsbuildSigningArguments": { @@ -435,14 +405,14 @@ "value": "false" }, "PB_PortableBuild": { - "value": "false", + "value": "true", "allowOverride": true }, "PB_SourcesDirectory": { "value": "$(Build.SourcesDirectory)\\core-setup" }, "PB_ChecksumAzureAccountName": { - "value": "dotnetclichecksums" + "value": "dotnetclichecksums" }, "PB_ChecksumAzureAccessToken": { "value": null, @@ -557,6 +527,7 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097676 + "revision": 418097676, + "visibility": "private" } } \ No newline at end of file diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json index e9680aa4..28b5d443 100644 --- a/buildpipeline/Core-Setup-Windows-BT.json +++ b/buildpipeline/Core-Setup-Windows-BT.json @@ -74,43 +74,6 @@ "feedSource": "https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json" } }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Run init-tools.cmd", - "timeoutInMinutes": 0, - "task": { - "id": "bfc8bf76-e7ac-4a8c-9a55-a944a9f632fd", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)\\init-tools.cmd", - "arguments": "", - "modifyEnvironment": "false", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, - { - "enabled": true, - "continueOnError": false, - "alwaysRun": false, - "displayName": "Generate version assets", - "timeoutInMinutes": 0, - "task": { - "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9", - "versionSpec": "1.*", - "definitionType": "task" - }, - "inputs": { - "filename": "$(PB_SourcesDirectory)\\build.cmd", - "arguments": "-- /t:GenerateVersionSourceFile /p:GenerateVersionSourceFile=true /p:OfficialBuildId=$(OfficialBuildId) $(PB_CommonMSBuildArgs)", - "workingFolder": "$(PB_SourcesDirectory)", - "failOnStandardError": "false" - } - }, { "enabled": true, "continueOnError": false, @@ -160,6 +123,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\sign.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:SignBinaries $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs)", @@ -167,11 +134,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -187,6 +150,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packages.log", @@ -194,11 +161,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -214,6 +177,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\sharedFramework\\sharedFramework.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\sharedframework.log", @@ -221,11 +188,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -241,6 +204,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:BuildInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\packaging.log", @@ -248,11 +215,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "true", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "true" } }, { @@ -268,6 +231,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\sign.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:SignMsiAndCab $(PB_CommonMSBuildArgs) $(MsbuildSigningArguments)", @@ -275,11 +242,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -295,6 +258,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:BuildCombinedInstallers $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\createbundles.log", @@ -302,11 +269,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -322,6 +285,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:ExtractEngineBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\extractengine.log", @@ -329,11 +296,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -349,6 +312,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\sign.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:SignEngine $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signengine.log", @@ -356,11 +323,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -376,6 +339,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\pkg\\packaging\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:ReattachEngineToBundle $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\reattachengine.log", @@ -383,11 +350,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -403,6 +366,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\sign.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/t:SignBundle $(MsbuildSigningArguments) $(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\signbundle.log", @@ -410,11 +377,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -430,6 +393,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\src\\test\\dir.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=diag;LogFile=$(PB_SourcesDirectory)\\tests.log", @@ -437,11 +404,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -457,6 +420,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", @@ -464,11 +431,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -484,6 +447,10 @@ }, "inputs": { "solution": "$(PB_SourcesDirectory)\\Tools\\scripts\\vstsagent\\cleanupagent.proj", + "msbuildLocationMethod": "version", + "msbuildVersion": "latest", + "msbuildArchitecture": "x64", + "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", "msbuildArguments": "/p:AgentDirectory=$(Agent.HomeDirectory) /p:DoClean=$(PB_CleanAgent)", @@ -491,11 +458,7 @@ "maximumCpuCount": "false", "restoreNugetPackages": "false", "logProjectEvents": "false", - "createLogFile": "false", - "msbuildLocationMethod": "version", - "msbuildVersion": "latest", - "msbuildArchitecture": "x64", - "msbuildLocation": "" + "createLogFile": "false" } }, { @@ -532,6 +495,16 @@ } ], "options": [ + { + "enabled": false, + "definition": { + "id": "5d58cc01-7c75-450c-be18-a388ddb129ec" + }, + "inputs": { + "branchFilters": "[\"+refs/heads/*\"]", + "additionalFields": "{}" + } + }, { "enabled": false, "definition": { @@ -614,10 +587,7 @@ "value": "400" }, "PB_DistroRid": { - "value": "win-x64" - }, - "RID": { - "value": "win-x64", + "value": "win-$(PB_TargetArchitecture)", "allowOverride": true }, "MsbuildSigningArguments": { @@ -630,7 +600,7 @@ "value": "false" }, "PB_PortableBuild": { - "value": "false", + "value": "true", "allowOverride": true }, "NUGET_SYMBOLS_FEED_URL": { @@ -752,6 +722,7 @@ "description": "Visual Studio and DevDiv team project for git source code repositories. Work items will be added for Adams, Dev14 work items are tracked in vstfdevdiv. ", "url": "https://devdiv.visualstudio.com/DefaultCollection/_apis/projects/0bdbc590-a062-4c3f-b0f6-9383f67865ee", "state": "wellFormed", - "revision": 418097676 + "revision": 418097676, + "visibility": "private" } } \ No newline at end of file From 013cdbc929f6bf0816f90c5e26336406f0c59d0a Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Thu, 25 May 2017 10:22:49 -0700 Subject: [PATCH 067/198] Port change to build as portable by default (#2518) --- dir.props | 5 +++++ netci.groovy | 59 ++++++++++++++++++++-------------------------------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dir.props b/dir.props index 71a57ca9..ad0273da 100644 --- a/dir.props +++ b/dir.props @@ -4,6 +4,11 @@ + + + true + + 2 diff --git a/netci.groovy b/netci.groovy index 0e0e1034..2f47d3dd 100644 --- a/netci.groovy +++ b/netci.groovy @@ -10,7 +10,7 @@ def project = GithubProject def branch = GithubBranchName def isPR = true -def platformList = ['Debian8.2:x64:Debug', 'PortableLinux:x64:Release', 'Ubuntu:x64:Release', 'Ubuntu16.04:x64:Release', 'Ubuntu16.10:x64:Release', 'Ubuntu:arm:Release', 'Ubuntu16.04:arm:Release', 'OSX10.12:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Fedora24:x64:Debug', 'OpenSUSE42.1:x64:Debug', 'Tizen:armel:Release'] +def platformList = ['Linux:x64:Release', 'Linux:arm:Release', 'OSX:x64:Release', 'Windows_NT:x64:Release', 'Windows_NT:x86:Debug', 'Windows_NT:arm:Debug', 'Tizen:armel:Release'] def static getBuildJobName(def configuration, def os, def architecture) { return configuration.toLowerCase() + '_' + os.toLowerCase() + '_' + architecture.toLowerCase() @@ -40,7 +40,7 @@ platformList.each { platform -> if (os == 'Windows_NT') { buildCommand = ".\\build.cmd ${buildArgs}" if ((architecture == 'arm' || architecture == 'arm64')) { - buildCommand += " -PortableBuild=true -SkipTests=true" + buildCommand += " -SkipTests=true" } } else if (os == 'Tizen') { @@ -48,40 +48,34 @@ platformList.each { platform -> dockerContainer = "ubuntu1404_cross_prereqs_v4-tizen_rootfs" dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture}.tizen.build --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildArgs += " -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" + buildArgs += " -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -PortableBuild=false -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" } - else if ((os.startsWith("Ubuntu")) && - (architecture == 'arm' || architecture == 'armel')) { - - if (os == 'Ubuntu') { + else if (os == "Linux") { + + // Prep for Portable Linux builds take place on Ubuntu 14.04 + if (architecture == 'arm' || architecture == 'armel') { dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239" - crossbuildargs = " -CrossBuild=true" + dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" + buildArgs += " -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true" + buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" + + osForGHTrigger = "Linux" + os = "Ubuntu" } - else if (os == 'Ubuntu16.04') { - dockerContainer = "ubuntu-16.04-cross-ef0ac75-20175511035548" + else { + // Jenkins non-Ubuntu CI machines don't have docker + buildCommand = "./build.sh ${buildArgs}" + + // Trigger a portable Linux build that runs on RHEL7.2 + osForGHTrigger = "Linux" + os = "RHEL7.2" } - dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildArgs += " -PortableBuild=true -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true${crossbuildargs}" - buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" - } - else if (os == "Ubuntu") { - dockerContainer = "ubuntu-14.04-debpkg-e5cf912-20175003025046" - dockerCommand = "docker run --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" - } - else if (os == "PortableLinux") { - // Jenkins non-Ubuntu CI machines don't have docker - buildArgs += " -PortableBuild=true" - buildCommand = "./build.sh ${buildArgs}" - - // Trigger a portable Linux build that runs on RHEL7.2 - osForGHTrigger = "PortableLinux" - os = "RHEL7.2" } else { // Jenkins non-Ubuntu CI machines don't have docker buildCommand = "./build.sh ${buildArgs}" + os = "OSX10.12" } def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) { @@ -105,15 +99,8 @@ platformList.each { platform -> Utilities.addMSTestResults(newJob, '**/*-testResults.trx') } - if (os == 'Ubuntu16.04' && architecture == 'arm') { - // Don't enable by default - def contextString = "${osForGHTrigger} ${architecture} ${configuration}" - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${contextString} Build", "(?i).*test\\W+${contextString}.*", true /* trigger on comment phrase only */) - } - else { - Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osForGHTrigger} ${architecture} ${configuration} Build") - } - + Utilities.addGithubPRTriggerForBranch(newJob, branch, "${osForGHTrigger} ${architecture} ${configuration} Build") + ArchivalSettings settings = new ArchivalSettings(); def archiveString = ["tar.gz", "zip", "deb", "msi", "pkg", "exe", "nupkg"].collect { "Bin/*/packages/*.${it},Bin/*/corehost/*.${it}" }.join(",") settings.addFiles(archiveString) From 249e6652c7c869e4c5f0ab7f03238664f7d94587 Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Thu, 25 May 2017 15:46:30 -0700 Subject: [PATCH 068/198] Ensure Duplicate items aren't present during publish --- publish/dir.props | 4 ++-- publish/publish.proj | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/publish/dir.props b/publish/dir.props index cc777ea6..95245d2b 100644 --- a/publish/dir.props +++ b/publish/dir.props @@ -28,10 +28,10 @@ $(BinariesRelativePath) - + $(InstallersRelativePath) - + $(InstallersRelativePath) diff --git a/publish/publish.proj b/publish/publish.proj index 268920b0..31aed2ba 100644 --- a/publish/publish.proj +++ b/publish/publish.proj @@ -29,8 +29,22 @@ Properties="%(Project.AdditionalProperties)" BuildInParallel="true" /> + + + + + + + @(ItemsToPublish->Count()) + @(DedupItems->Count()) + <_HasDups Condition="'$(CountOld)' != '$(CountNew)'">true + + + + From 25f8974b793cf75e6509083e6d3b1b67fac298a8 Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Thu, 25 May 2017 15:52:30 -0700 Subject: [PATCH 069/198] Combine packaging props and publish props for deb packages --- dir.props | 21 +++++++++++++++++++++ publish/dir.targets | 10 +++++----- src/dir.props | 12 ------------ src/pkg/packaging/dir.props | 13 ------------- 4 files changed, 26 insertions(+), 30 deletions(-) diff --git a/dir.props b/dir.props index ad0273da..d3b86e97 100644 --- a/dir.props +++ b/dir.props @@ -381,6 +381,27 @@ $(InstallerExtension) + + + $(TargetRid) + osx.10.10-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 + $(SharedFrameworkNugetVersion)-$(PackageTargetRid) + $(HostResolverVersion)-$(PackageTargetRid) + + + + $(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension) + $(CombinedInstallerStart)$(ProductMoniker)-engine.exe + $(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension) + $(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension) + $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) + + diff --git a/publish/dir.targets b/publish/dir.targets index d28c172f..38623655 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -70,14 +70,14 @@ Text=" Missing parameters for debian publish." /> - + dotnet-host - - dotnet-hostfxr-$(HostResolverVersion.ToLower()) + + $([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)')) - - dotnet-runtime-$(SharedFrameworkNugetVersion.ToLower()) + + $([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)')) diff --git a/src/dir.props b/src/dir.props index 783789f5..39af4dea 100644 --- a/src/dir.props +++ b/src/dir.props @@ -20,18 +20,6 @@ $(LibPrefix)hostpolicy$(LibSuffix) - - - - $(TargetRid) - osx.10.10-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 - - .map .ni.pdb diff --git a/src/pkg/packaging/dir.props b/src/pkg/packaging/dir.props index 0a4b661f..708c4096 100644 --- a/src/pkg/packaging/dir.props +++ b/src/pkg/packaging/dir.props @@ -15,11 +15,6 @@ $(IntermediateOutputRootPath)combined-framework-host/ - - $(SharedFrameworkNugetVersion)-$(PackageTargetRid) - $(HostResolverVersion)-$(PackageTargetRid) - - dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension) dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension) @@ -27,14 +22,6 @@ dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension) - - $(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension) - $(CombinedInstallerStart)$(ProductMoniker)-engine.exe - $(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension) - $(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension) - $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) - - Microsoft .NET Core $(ProductionVersion) Microsoft .NET Core $(ProductionVersion) $(ReleaseBrandSuffix) From 894d89943b8a57edaac1cf8d4cd80a50fab633ae Mon Sep 17 00:00:00 2001 From: Vivek Mishra Date: Thu, 25 May 2017 19:59:32 -0700 Subject: [PATCH 070/198] Rpm Packaging improvements for adding Vendor name and updating Packager value (2.0) (#2536) * Added Vendor flag and updated value for maintainer * Added escape arg * Added escape arg * Removed email from maintainer name and added the same t o the parameter value separately * Updated Vendor value * Made email edits based on feedback * Fixed the new naming convention for Runtime for package name --- src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json | 5 +++-- src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json | 5 +++-- src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json | 5 +++-- src/pkg/packaging/rpm/package.props | 2 +- tools-local/tasks/BuildFPMToolPreReqs .cs | 4 +++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json index a3caefff..319964ea 100644 --- a/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-hostfxr-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name": "Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "vendor": ".NET Foundation", "package_name": "%HOSTFXR_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json index 0a7ef7b2..b9afffa2 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedframework-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name":"Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "vendor": ".NET Foundation", "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json index fc2ce896..ab098cae 100644 --- a/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json +++ b/src/pkg/packaging/rpm/dotnet-sharedhost-rpm_config.json @@ -1,6 +1,7 @@ { - "maintainer_name":"Microsoft", - "maintainer_email": "dotnetcore@microsoft.com", + "maintainer_name": ".NET Core Team", + "maintainer_email": "dotnetpackages@dotnetfoundation.org", + "vendor": ".NET Foundation", "package_name": "dotnet-host", "install_root": "/usr/share/dotnet", diff --git a/src/pkg/packaging/rpm/package.props b/src/pkg/packaging/rpm/package.props index 3bef4e46..77b10da4 100644 --- a/src/pkg/packaging/rpm/package.props +++ b/src/pkg/packaging/rpm/package.props @@ -7,7 +7,7 @@ $(SharedHostRpmPkgName.ToLower()) dotnet-hostfxr-$(HostResolverVersion) $(HostFxrRpmPkgName.ToLower()) - dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFrameworkNugetVersion) + dotnet-runtime-$(SharedFrameworkNugetVersion) $(SharedFxRpmPkgName.ToLower()) $(MSBuildThisFileDirectory)/templates $(MSBuildThisFileDirectory)/scripts diff --git a/tools-local/tasks/BuildFPMToolPreReqs .cs b/tools-local/tasks/BuildFPMToolPreReqs .cs index 031b4f44..d04cb8c2 100644 --- a/tools-local/tasks/BuildFPMToolPreReqs .cs +++ b/tools-local/tasks/BuildFPMToolPreReqs .cs @@ -187,7 +187,8 @@ namespace Microsoft.DotNet.Build.Tasks parameters.Add(string.Concat("--rpm-changelog ", EscapeArg(Path.Combine(InputDir, "templates", "changelog")))); // Changelog File parameters.Add(string.Concat("--rpm-summary ", EscapeArg(configJson.Short_Description))); parameters.Add(string.Concat("--description ", EscapeArg(configJson.Long_Description))); - parameters.Add(string.Concat("--maintainer ", configJson.Maintainer_Name)); + parameters.Add(string.Concat("--maintainer ", EscapeArg(configJson.Maintainer_Name + " <" + configJson.Maintainer_Email + ">"))); + parameters.Add(string.Concat("--vendor ", EscapeArg(configJson.Vendor))); parameters.Add(string.Concat("-p ", Path.Combine(OutputDir, configJson.Package_Name + ".rpm"))); if (configJson.Package_Conflicts != null) parameters.Add(string.Concat("--conflicts ", EscapeArg(string.Join(",", configJson.Package_Conflicts)))); if (configJson.After_Install_Source != null) parameters.Add(string.Concat("--after-install ", Path.Combine(InputDir, EscapeArg(configJson.After_Install_Source)))); @@ -275,6 +276,7 @@ namespace Microsoft.DotNet.Build.Tasks { public string Maintainer_Name { get; set; } public string Maintainer_Email { get; set; } + public string Vendor { get; set; } public string Package_Name { get; set; } public string Install_Root { get; set; } public string Install_Doc { get; set; } From c02c08a3096814086974c1cd60a4e2fe0ab37c0f Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 26 May 2017 07:08:58 -0700 Subject: [PATCH 071/198] Update CoreClr, CoreFx, Standard, WCF to preview2-25326-01, preview2-25325-03, preview2-25325-01, preview2-25325-03, respectively (#2528) --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index 254c82ff..e8895b7f 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 2ded50b86b1599881e556363fa62bc7bde850525 - 2ded50b86b1599881e556363fa62bc7bde850525 - 2ded50b86b1599881e556363fa62bc7bde850525 - 2ded50b86b1599881e556363fa62bc7bde850525 + 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 + 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 + 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 + 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 - 4.4.0-preview2-25324-02 - 2.0.0-preview2-25324-02 - 2.0.0-preview2-25324-01 + 4.4.0-preview2-25325-03 + 2.0.0-preview2-25325-03 + 2.0.0-preview2-25326-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25324-01 + 2.0.0-preview2-25325-01 1.4.1 - 4.4.0-preview2-25324-01 + 4.4.0-preview2-25325-03 From 41727dcc1ede2c5061ad6c1385591d1982d17dd3 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Thu, 25 May 2017 13:01:01 -0700 Subject: [PATCH 072/198] remove user profile store --- .../design-docs/DotNetCore-SharedPackageStore.md | 15 ++------------- src/corehost/cli/args.cpp | 9 --------- src/corehost/cli/args.h | 2 -- src/corehost/cli/deps_resolver.cpp | 5 ----- src/corehost/common/utils.cpp | 11 ----------- src/corehost/common/utils.h | 1 - 6 files changed, 2 insertions(+), 41 deletions(-) diff --git a/Documentation/design-docs/DotNetCore-SharedPackageStore.md b/Documentation/design-docs/DotNetCore-SharedPackageStore.md index 051e69a5..d13ed259 100644 --- a/Documentation/design-docs/DotNetCore-SharedPackageStore.md +++ b/Documentation/design-docs/DotNetCore-SharedPackageStore.md @@ -5,7 +5,7 @@ To enable sharing of assemblies among all machine-wide .NET Core applications, a ### Packages Store -The package store can be either a global system-wide folder or a user local folder: +The package store can be either a global system-wide folder or a dotnet.exe relative folder: + **Global**: - The `dotnet` root location -- on Windows, the folder is located in `C:\Program Files (x86)\`. See layout below. @@ -29,17 +29,6 @@ The package store can be either a global system-wide folder or a user local fold The layout within `netcoreapp*` folders is a NuGet cache layout. -+ **User**: The user local location can be used to override the global location when probing assemblies and uses a very similar layout, except that the `packages/install` folder is NOT supported in the user profile. It is only supported in the global location. - -``` - - %USERPROFILE% or $HOME/ - - .dotnet - - store - - {arch=x86|x64} - = do = -``` - -**OPEN**: Should we have a `dotnet` relative location as well, if operating out of a zip installation of .NET Core binaries? ### Composing a runtime (non-ref) package store @@ -117,7 +106,7 @@ The host will probe in the following order of precedence for `dotnet run` and ap + `$CORE_SERVICING` on Unix or `%ProgramFiles(x86)%\coreservicing` on Windows. + `DOTNET_SHARED_STORE` in the chained order -+ The user local shared package store in `%USERPROFILE%\.dotnet\store` or `$HOME/.dotnet/store` ++ The dotnet.exe relative shared package store + The global shared package store + The Shared Framework directory + ~~`DOTNET_HOSTING_OPTIMIZATION_CACHE` deprecated in favor of `DOTNET_SHARED_STORE`~~ diff --git a/src/corehost/cli/args.cpp b/src/corehost/cli/args.cpp index e42887bd..74a4fe3b 100644 --- a/src/corehost/cli/args.cpp +++ b/src/corehost/cli/args.cpp @@ -39,15 +39,6 @@ void setup_shared_store_paths(const hostpolicy_init_t& init, const pal::string_t // Environment variable DOTNET_SHARED_STORE (void) get_env_shared_store_dirs(&args->env_shared_store, get_arch(), init.tfm); - // User profile based store - pal::string_t local_shared_store; - if (get_local_shared_store_dir(&local_shared_store)) - { - append_path(&local_shared_store, get_arch()); - append_path(&local_shared_store, init.tfm.c_str()); - args->local_shared_store = local_shared_store; - } - // "dotnet.exe" relative shared store folder if (init.host_mode == host_mode_t::muxer) { diff --git a/src/corehost/cli/args.h b/src/corehost/cli/args.h index cf7827c9..6416113a 100644 --- a/src/corehost/cli/args.h +++ b/src/corehost/cli/args.h @@ -84,7 +84,6 @@ struct arguments_t pal::string_t core_servicing; std::vector probe_paths; pal::string_t managed_application; - pal::string_t local_shared_store; std::vector global_shared_stores; pal::string_t dotnet_shared_store; std::vector env_shared_store; @@ -107,7 +106,6 @@ struct arguments_t { trace::verbose(_X("-- arguments_t: env shared store: '%s'"), shared.c_str()); } - trace::verbose(_X("-- arguments_t: local shared store: '%s'"), local_shared_store.c_str()); trace::verbose(_X("-- arguments_t: dotnet shared store: '%s'"), dotnet_shared_store.c_str()); for (const auto& global_shared : global_shared_stores) { diff --git a/src/corehost/cli/deps_resolver.cpp b/src/corehost/cli/deps_resolver.cpp index d7807aaf..442f1b1d 100644 --- a/src/corehost/cli/deps_resolver.cpp +++ b/src/corehost/cli/deps_resolver.cpp @@ -152,11 +152,6 @@ void deps_resolver_t::setup_shared_store_probes( } } - if (pal::directory_exists(args.local_shared_store)) - { - m_probes.push_back(probe_config_t::lookup(args.local_shared_store)); - } - if (pal::directory_exists(args.dotnet_shared_store)) { m_probes.push_back(probe_config_t::lookup(args.dotnet_shared_store)); diff --git a/src/corehost/common/utils.cpp b/src/corehost/common/utils.cpp index b104d32b..021459c1 100644 --- a/src/corehost/common/utils.cpp +++ b/src/corehost/common/utils.cpp @@ -295,14 +295,3 @@ bool get_global_shared_store_dirs(std::vector* dirs, const pal:: } return true; } - -bool get_local_shared_store_dir(pal::string_t* dir) -{ - if (!pal::get_local_dotnet_dir(dir)) - { - return false; - } - - append_path(dir, RUNTIME_STORE_DIRECTORY_NAME); - return true; -} diff --git a/src/corehost/common/utils.h b/src/corehost/common/utils.h index ec181422..19db50b2 100644 --- a/src/corehost/common/utils.h +++ b/src/corehost/common/utils.h @@ -40,6 +40,5 @@ bool parse_known_args( int* num_args); bool skip_utf8_bom(pal::ifstream_t* stream); bool get_env_shared_store_dirs(std::vector* dirs, const pal::string_t& arch, const pal::string_t& tfm); -bool get_local_shared_store_dir(pal::string_t* recv); bool get_global_shared_store_dirs(std::vector* dirs, const pal::string_t& arch, const pal::string_t& tfm); #endif From 8baab55742a9940c02f394eff840c331c0c6909a Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Fri, 26 May 2017 01:50:02 -0700 Subject: [PATCH 073/198] interpret |arch|/|tfm| in additionalprobingpaths --- .../DotNetCore-SharedPackageStore.md | 17 ++++---- src/corehost/cli/deps_resolver.cpp | 12 ------ src/corehost/cli/fxr/fx_muxer.cpp | 42 ++++++++++++++++--- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/Documentation/design-docs/DotNetCore-SharedPackageStore.md b/Documentation/design-docs/DotNetCore-SharedPackageStore.md index d13ed259..2d8eda0f 100644 --- a/Documentation/design-docs/DotNetCore-SharedPackageStore.md +++ b/Documentation/design-docs/DotNetCore-SharedPackageStore.md @@ -105,15 +105,18 @@ Note that this is different from current behavior of `dotnet run` for an applica The host will probe in the following order of precedence for `dotnet run` and application activations post `dotnet publish`: + `$CORE_SERVICING` on Unix or `%ProgramFiles(x86)%\coreservicing` on Windows. ++ Application Bin and Shared FX directory + `DOTNET_SHARED_STORE` in the chained order -+ The dotnet.exe relative shared package store -+ The global shared package store -+ The Shared Framework directory -+ ~~`DOTNET_HOSTING_OPTIMIZATION_CACHE` deprecated in favor of `DOTNET_SHARED_STORE`~~ -+ `--additionalprobingpaths` specified in the command line -+ `runtimeOptions.additionalProbingPaths` (includes NuGet cache probe specified by the CLI for `dotnet run`) -+ Application `bin` directory ++ Store locations + - The dotnet.exe relative shared package store + - The global shared package store + - ~~`DOTNET_HOSTING_OPTIMIZATION_CACHE` deprecated in favor of `DOTNET_SHARED_STORE`~~ ++ Additional Probing Paths + - `--additionalprobingpaths` specified in the command line + - `runtimeOptions.additionalProbingPaths` (includes NuGet cache probe specified by the CLI for `dotnet run`) +**NOTE:** `--additionalprobingpaths` can be passed template paths like below and the host will interpret `|arch|/|tfm|` appropriately to look for assets: + `%USERPROFILE%\user\cache\|arch|\|tfm|` or `$HOME/user/cache/|arch|/|tfm|` ## dotnet publish Publish will be enhanced to support a filter profile file specified as xml. This file explicitly lists all asset packages that need to be trimmed out of the publish output. The following are examples of how various application types can be published. diff --git a/src/corehost/cli/deps_resolver.cpp b/src/corehost/cli/deps_resolver.cpp index 442f1b1d..b6ba1349 100644 --- a/src/corehost/cli/deps_resolver.cpp +++ b/src/corehost/cli/deps_resolver.cpp @@ -234,18 +234,6 @@ void deps_resolver_t::setup_probe_config( void deps_resolver_t::setup_additional_probes(const std::vector& probe_paths) { m_additional_probes.assign(probe_paths.begin(), probe_paths.end()); - - for (auto iter = m_additional_probes.begin(); iter != m_additional_probes.end(); ) - { - if (pal::directory_exists(*iter)) - { - ++iter; - } - else - { - iter = m_additional_probes.erase(iter); - } - } } /** diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 17472c8e..2379c01e 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -831,12 +831,42 @@ int muxer_usage(bool is_sdk_present) } // Convert "path" to realpath (merging working dir if needed) and append to "realpaths" out param. -void append_realpath(const pal::string_t& path, std::vector* realpaths) +void append_probe_realpath(const pal::string_t& path, std::vector* realpaths, const pal::string_t& tfm) { - pal::string_t real = path; - if (pal::realpath(&real)) + pal::string_t probe_path = path; + + if (pal::realpath(&probe_path) && pal::directory_exists(probe_path)) { - realpaths->push_back(real); + realpaths->push_back(probe_path); + } + else + { + //Check if we can extrapolate |arch||tfm| for probing stores + pal::string_t placeholder = _X("|arch|"); + placeholder.push_back(DIR_SEPARATOR); + placeholder.append(_X("|tfm|")); + auto pos_placeholder = probe_path.find_last_of(placeholder); + + if (pos_placeholder != pal::string_t::npos) + { + pal::string_t segment = get_arch(); + segment.push_back(DIR_SEPARATOR); + segment.append(tfm); + probe_path.replace(pos_placeholder - placeholder.length() + 1, placeholder.length(), segment); + + if (pal::directory_exists(probe_path)) + { + realpaths->push_back(probe_path); + } + else + { + trace::verbose(_X("Ignoring host interpreted additional probing path %s as it does not exist."),probe_path.c_str()); + } + } + else + { + trace::verbose(_X("Ignoring additional probing path %s as it does not exist."),probe_path.c_str()); + } } } @@ -991,11 +1021,11 @@ int fx_muxer_t::read_config_and_execute( std::vector probe_realpaths; for (const auto& path : spec_probe_paths) { - append_realpath(path, &probe_realpaths); + append_probe_realpath(path, &probe_realpaths, config.get_tfm()); } for (const auto& path : config.get_probe_paths()) { - append_realpath(path, &probe_realpaths); + append_probe_realpath(path, &probe_realpaths, config.get_tfm()); } // 'Roll forward on no candidate fx' is disabled by default. It can be enabled through: From aeaab48e9e452fe025988003f7463806f47085fe Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Thu, 25 May 2017 18:44:40 -0700 Subject: [PATCH 074/198] adding Store support to testfixture --- src/test/TestUtils/DotNetCli.cs | 2 + src/test/TestUtils/TestProjectFixture.cs | 59 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/src/test/TestUtils/DotNetCli.cs b/src/test/TestUtils/DotNetCli.cs index 60b18284..48b46373 100644 --- a/src/test/TestUtils/DotNetCli.cs +++ b/src/test/TestUtils/DotNetCli.cs @@ -41,6 +41,8 @@ namespace Microsoft.DotNet.Cli.Build public Command Test(params string[] args) => Exec("test", args); public Command Publish(params string[] args) => Exec("publish", args); + public Command Store(params string[] args) => Exec("store", args); + private void ComputeSharedFxPaths() { var sharedFxBaseDirectory = Path.Combine(BinPath, "shared", "Microsoft.NETCore.App"); diff --git a/src/test/TestUtils/TestProjectFixture.cs b/src/test/TestUtils/TestProjectFixture.cs index e219fa90..8dd2dd21 100644 --- a/src/test/TestUtils/TestProjectFixture.cs +++ b/src/test/TestUtils/TestProjectFixture.cs @@ -235,6 +235,65 @@ namespace Microsoft.DotNet.CoreSetup.Test return this; } + public TestProjectFixture StoreProject( + DotNetCli dotnet = null, + string runtime = null, + string framework = "netcoreapp2.0", + string manifest = null, + string outputDirectory = null) + { + dotnet = dotnet ?? _sdkDotnet; + outputDirectory = outputDirectory ?? _testProject.OutputDirectory; + + var storeArgs = new List(); + storeArgs.Add("--runtime"); + if (runtime != null) + { + storeArgs.Add(runtime); + } + else + { + storeArgs.Add(CurrentRid); + } + + if (framework != null) + { + storeArgs.Add("--framework"); + storeArgs.Add(framework); + } + + storeArgs.Add("--manifest"); + if (manifest != null) + { + storeArgs.Add(manifest); + } + else + { + storeArgs.Add(_sourceTestProject.ProjectFile); + } + + if (outputDirectory != null) + { + storeArgs.Add("-o"); + storeArgs.Add(outputDirectory); + } + + storeArgs.Add("--working-dir"); + storeArgs.Add("store_workin_dir"); + + dotnet.Store(storeArgs.ToArray()) + .WorkingDirectory(_testProject.ProjectDirectory) + .Environment("NUGET_PACKAGES", _repoDirectoriesProvider.NugetPackages) + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .EnsureSuccessful(); + + _testProject.LoadOutputFiles(); + + return this; + } + public TestProjectFixture PublishProject( DotNetCli dotnet = null, string runtime = null, From 6c6407e13750a9e0be8dda0303020e4080debb77 Mon Sep 17 00:00:00 2001 From: Rama Krishnan Raghupathy Date: Thu, 25 May 2017 18:47:26 -0700 Subject: [PATCH 075/198] adding tests for templated AdditionalProbingPath --- ...ivenThatICareAboutPortableAppActivation.cs | 47 +++++++++++++++++++ src/test/TestUtils/TestProject.cs | 3 ++ src/test/TestUtils/TestProjectFixture.cs | 22 ++++++--- 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/src/test/HostActivationTests/GivenThatICareAboutPortableAppActivation.cs b/src/test/HostActivationTests/GivenThatICareAboutPortableAppActivation.cs index c994e8b9..c2623932 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutPortableAppActivation.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutPortableAppActivation.cs @@ -124,6 +124,40 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.PortableApp .HaveStdOutContaining("Hello World"); } + [Fact] + public void Muxer_Activation_With_Templated_AdditionalProbingPath_Succeeds() + { + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture + .Copy(); + + var store_path = CreateAStore(fixture); + var dotnet = fixture.BuiltDotnet; + var appDll = fixture.TestProject.AppDll; + + var destRuntimeDevConfig = fixture.TestProject.RuntimeDevConfigJson; + if (File.Exists(destRuntimeDevConfig)) + { + File.Delete(destRuntimeDevConfig); + } + + var additionalProbingPath = store_path + "/|arch|/|tfm|"; + + dotnet.Exec( + "exec", + "--additionalprobingpath", additionalProbingPath, + appDll) + .EnvironmentVariable("COREHOST_TRACE", "1") + .CaptureStdErr() + .CaptureStdOut() + .Execute() + .Should() + .Pass() + .And + .HaveStdOutContaining("Hello World") + .And + .HaveStdErrContaining($"Adding tpa entry: {Path.Combine(store_path,fixture.RepoDirProvider.BuildArchitecture, fixture.Framework)}"); + } + [Fact] public void Muxer_Exec_activation_of_Build_Output_Portable_DLL_with_DepsJson_Remote_and_RuntimeConfig_Local_Succeeds() { @@ -255,5 +289,18 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.PortableApp testProjectFixture.TestProject.RuntimeConfigJson = destRuntimeConfig; } + + private string CreateAStore(TestProjectFixture testProjectFixture) + { + var storeoutputDirectory = Path.Combine(testProjectFixture.TestProject.ProjectDirectory, "store"); + if (!Directory.Exists(storeoutputDirectory)) + { + Directory.CreateDirectory(storeoutputDirectory); + } + + testProjectFixture.StoreProject(outputDirectory :storeoutputDirectory); + + return storeoutputDirectory; + } } } diff --git a/src/test/TestUtils/TestProject.cs b/src/test/TestUtils/TestProject.cs index 5939dc9f..814b5c65 100644 --- a/src/test/TestUtils/TestProject.cs +++ b/src/test/TestUtils/TestProject.cs @@ -18,6 +18,7 @@ namespace Microsoft.DotNet.CoreSetup.Test private string _projectFile; private string _projectAssetsJson; private string _runtimeConfigJson; + private string _runtimeDevConfigJson; private string _depsJson; private string _appDll; private string _appExe; @@ -32,6 +33,7 @@ namespace Microsoft.DotNet.CoreSetup.Test public string ProjectFile { get { return _projectFile; } set { _projectFile = value; } } public string ProjectAssetsJson { get { return _projectAssetsJson; } set { _projectAssetsJson = value; } } public string RuntimeConfigJson { get { return _runtimeConfigJson; } set { _runtimeConfigJson = value; } } + public string RuntimeDevConfigJson { get { return _runtimeDevConfigJson; } set { _runtimeDevConfigJson = value; } } public string DepsJson { get { return _depsJson; } set { _depsJson = value; } } public string AppDll { get { return _appDll; } set { _appDll = value; } } public string AppExe { get { return _appExe; } set { _appExe = value; } } @@ -71,6 +73,7 @@ namespace Microsoft.DotNet.CoreSetup.Test _appExe = Path.Combine(_outputDirectory, $"{_projectName}{_exeExtension}"); _depsJson = Path.Combine(_outputDirectory, $"{_projectName}.deps.json"); _runtimeConfigJson = Path.Combine(_outputDirectory, $"{_projectName}.runtimeconfig.json"); + _runtimeDevConfigJson = Path.Combine(_outputDirectory, $"{_projectName}.runtimeconfig.dev.json"); _hostPolicyDll = Path.Combine(_outputDirectory, $"{_sharedLibraryPrefix}hostpolicy{_sharedLibraryExtension}"); _hostFxrDll = Path.Combine(_outputDirectory, $"{_sharedLibraryPrefix}hostfxr{_sharedLibraryExtension}"); } diff --git a/src/test/TestUtils/TestProjectFixture.cs b/src/test/TestUtils/TestProjectFixture.cs index 8dd2dd21..ed4b94f5 100644 --- a/src/test/TestUtils/TestProjectFixture.cs +++ b/src/test/TestUtils/TestProjectFixture.cs @@ -21,6 +21,7 @@ namespace Microsoft.DotNet.CoreSetup.Test private string _testProjectSourceDirectory; private string _testArtifactDirectory; private string _currentRid; + private string _framework; private RepoDirectoriesProvider _repoDirectoriesProvider; @@ -38,7 +39,8 @@ namespace Microsoft.DotNet.CoreSetup.Test public string ExeExtension => _exeExtension; public string SharedLibraryExtension => _sharedLibraryExtension; public string SharedLibraryPrefix => _sharedLibraryPrefix; - + public string Framework => _framework; + public RepoDirectoriesProvider RepoDirProvider => _repoDirectoriesProvider; public TestProjectFixture( string testProjectName, RepoDirectoriesProvider repoDirectoriesProvider, @@ -49,7 +51,8 @@ namespace Microsoft.DotNet.CoreSetup.Test string testArtifactDirectory = null, string dotnetInstallPath = null, string currentRid = null, - string builtDotnetOutputPath = null) + string builtDotnetOutputPath = null, + string framework = "netcoreapp2.0") { ValidateRequiredDirectories(repoDirectoriesProvider); @@ -73,7 +76,7 @@ namespace Microsoft.DotNet.CoreSetup.Test _currentRid = currentRid ?? repoDirectoriesProvider.TargetRID; _builtDotnet = new DotNetCli(repoDirectoriesProvider.BuiltDotnet); - + _framework = framework; InitializeTestProject( _testProjectName, _testProjectSourceDirectory, @@ -96,6 +99,7 @@ namespace Microsoft.DotNet.CoreSetup.Test _currentRid = fixtureToCopy._currentRid; _builtDotnet = fixtureToCopy._builtDotnet; _sourceTestProject = fixtureToCopy._sourceTestProject; + _framework = fixtureToCopy._framework; _testProject = CopyTestProject( fixtureToCopy.TestProject, @@ -196,12 +200,14 @@ namespace Microsoft.DotNet.CoreSetup.Test public TestProjectFixture BuildProject( DotNetCli dotnet = null, string runtime = null, - string framework = "netcoreapp2.0", + string framework = null, string outputDirectory = null) { dotnet = dotnet ?? _sdkDotnet; outputDirectory = outputDirectory ?? _testProject.OutputDirectory; _testProject.OutputDirectory = outputDirectory; + framework = framework ?? _framework; + _framework = framework; var buildArgs = new List(); if (runtime != null) @@ -238,12 +244,14 @@ namespace Microsoft.DotNet.CoreSetup.Test public TestProjectFixture StoreProject( DotNetCli dotnet = null, string runtime = null, - string framework = "netcoreapp2.0", + string framework = null, string manifest = null, string outputDirectory = null) { dotnet = dotnet ?? _sdkDotnet; outputDirectory = outputDirectory ?? _testProject.OutputDirectory; + framework = framework ?? _framework; + _framework = framework; var storeArgs = new List(); storeArgs.Add("--runtime"); @@ -297,12 +305,14 @@ namespace Microsoft.DotNet.CoreSetup.Test public TestProjectFixture PublishProject( DotNetCli dotnet = null, string runtime = null, - string framework = "netcoreapp2.0", + string framework = null, string outputDirectory = null) { dotnet = dotnet ?? _sdkDotnet; outputDirectory = outputDirectory ?? _testProject.OutputDirectory; _testProject.OutputDirectory = outputDirectory; + framework = framework ?? _framework; + _framework = framework; var publishArgs = new List(); if (runtime != null) From 9c7150ac60183d1c7d8a43910e4730c81ff54de5 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Fri, 26 May 2017 15:18:49 -0700 Subject: [PATCH 076/198] Update CoreClr, Standard, WCF to preview2-25326-02, preview2-25326-01, preview2-25326-11, respectively --- dependencies.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.props b/dependencies.props index e8895b7f..f565569c 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 - 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 - 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 - 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 + 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 + 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 + 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 4.4.0-preview2-25325-03 2.0.0-preview2-25325-03 - 2.0.0-preview2-25326-01 + 2.0.0-preview2-25326-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25325-01 + 2.0.0-preview2-25326-01 1.4.1 - 4.4.0-preview2-25325-03 + 4.4.0-preview2-25326-11 From b6e8abaabb5dff5e0efac4fe2fb7c19b829bf0ed Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 30 May 2017 06:44:06 -0700 Subject: [PATCH 077/198] Update CoreClr, CoreFx, Standard, WCF to preview2-25330-01, preview2-25330-01, preview2-25330-01, preview2-25330-01, respectively --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index f565569c..1b2b129f 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 2ba5d0c281995f1d99abea27cf8787a5755ea5c8 - 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 - 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 - 1490403a3e671dcb4aeba2fb308dd711ca3ab2c5 + 969d2bc613cc192283ef4d303803df9e39aa40aa + 969d2bc613cc192283ef4d303803df9e39aa40aa + 969d2bc613cc192283ef4d303803df9e39aa40aa + 969d2bc613cc192283ef4d303803df9e39aa40aa - 4.4.0-preview2-25325-03 - 2.0.0-preview2-25325-03 - 2.0.0-preview2-25326-02 + 4.4.0-preview2-25330-01 + 2.0.0-preview2-25330-01 + 2.0.0-preview2-25330-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25326-01 + 2.0.0-preview2-25330-01 1.4.1 - 4.4.0-preview2-25326-11 + 4.4.0-preview2-25330-01 From ea4a90cd45754a92104313b8052b05395c91800a Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Thu, 25 May 2017 16:43:04 -0700 Subject: [PATCH 078/198] Combine the publish and package names for deb --- dir.props | 11 ++++++++++- publish/dir.targets | 6 +++--- src/pkg/packaging/deb/package.props | 9 --------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dir.props b/dir.props index d3b86e97..9a4b0a5f 100644 --- a/dir.props +++ b/dir.props @@ -389,7 +389,7 @@ rhel.7-x64 rhel.7-x64 rhel.7-x64 - rhel.7-x64 + rhel.7-x64 $(SharedFrameworkNugetVersion)-$(PackageTargetRid) $(HostResolverVersion)-$(PackageTargetRid) @@ -402,6 +402,15 @@ $(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension) + + dotnet-host + $(SharedHostDebPkgName.ToLower()) + $([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)')) + $(HostFxrDebPkgName.ToLower()) + $([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)')) + $(SharedFxDebPkgName.ToLower()) + + diff --git a/publish/dir.targets b/publish/dir.targets index 38623655..9d0b8691 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -71,13 +71,13 @@ - dotnet-host + $(SharedHostDebPkgName) - $([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)')) + $(HostFxrDebPkgName) - $([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)')) + $(SharedFxDebPkgName) diff --git a/src/pkg/packaging/deb/package.props b/src/pkg/packaging/deb/package.props index 5142be74..2b9c2114 100644 --- a/src/pkg/packaging/deb/package.props +++ b/src/pkg/packaging/deb/package.props @@ -6,14 +6,5 @@ dotnet-deb-tool-consumer.csproj $(IntermediateOutputRootPath)$(toolConsumerProjectName) $(PackagingRoot)deb/ - - dotnet-host - $(SharedHostDebPkgName.ToLower()) - - dotnet-hostfxr-$(HostResolverVersion) - $(HostFxrDebPkgName.ToLower()) - - dotnet-runtime-$(SharedFrameworkNugetVersion) - $(SharedFxDebPkgName.ToLower()) \ No newline at end of file From 01d90713ddea6ec3e9356ba3e306a6dc0372d11f Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Tue, 30 May 2017 12:14:30 -0700 Subject: [PATCH 079/198] Remove Debian.8 Armel from Identity Package (#2558) --- src/pkg/projects/netcoreappRIDs.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pkg/projects/netcoreappRIDs.props b/src/pkg/projects/netcoreappRIDs.props index dcbc85f7..1f7736bd 100644 --- a/src/pkg/projects/netcoreappRIDs.props +++ b/src/pkg/projects/netcoreappRIDs.props @@ -35,9 +35,6 @@ - - armel - armel From 82d69324c907756cb12cb6292d5bd0ed8fe317ae Mon Sep 17 00:00:00 2001 From: chcosta Date: Tue, 30 May 2017 13:54:24 -0700 Subject: [PATCH 080/198] Sign ARM binaries in pipeline (#2477) (#2560) * Sign ARM binaries in pipeline * Sign msi before bundling * Remove spaces --- src/pkg/packaging/dir.proj | 7 +++++-- src/pkg/packaging/windows/package.targets | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index d009bd59..45ac56ff 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -12,7 +12,9 @@ - + + + @@ -148,7 +150,6 @@ GenerateMsis; - GenerateBundles; GeneratePkgs; GenerateDebs; GenerateRpms; @@ -156,6 +157,8 @@ + + diff --git a/src/pkg/packaging/windows/package.targets b/src/pkg/packaging/windows/package.targets index 06b81f98..b2d93a30 100644 --- a/src/pkg/packaging/windows/package.targets +++ b/src/pkg/packaging/windows/package.targets @@ -6,7 +6,19 @@ + + + + + + @@ -60,15 +72,6 @@ - - - - @@ -85,7 +88,7 @@ $(WindowsScriptRoot)sharedframework\generatebundle.ps1 From e6104d9b13c354356cebe8842aa1cdcce28cf885 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 30 May 2017 19:26:13 -0700 Subject: [PATCH 081/198] Update CoreClr, CoreFx to preview2-25330-02, preview2-25331-01, respectively (#2565) --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 1b2b129f..cfe93f80 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 969d2bc613cc192283ef4d303803df9e39aa40aa - 969d2bc613cc192283ef4d303803df9e39aa40aa + d4040dc6f74933eec9827d44e288c9cd15996a15 + d4040dc6f74933eec9827d44e288c9cd15996a15 969d2bc613cc192283ef4d303803df9e39aa40aa 969d2bc613cc192283ef4d303803df9e39aa40aa - 4.4.0-preview2-25330-01 - 2.0.0-preview2-25330-01 - 2.0.0-preview2-25330-01 + 4.4.0-preview2-25331-01 + 2.0.0-preview2-25331-01 + 2.0.0-preview2-25330-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25330-01 1.4.1 From 3e9713398d6ab98d29cc73dc689d5f4f4a09f7b0 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 31 May 2017 07:01:57 -0700 Subject: [PATCH 082/198] Update CoreClr, CoreFx, Standard, WCF to preview2-25331-02, preview2-25331-02, preview2-25331-01, preview2-25331-01, respectively (#2566) --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index cfe93f80..32a88635 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - d4040dc6f74933eec9827d44e288c9cd15996a15 - d4040dc6f74933eec9827d44e288c9cd15996a15 - 969d2bc613cc192283ef4d303803df9e39aa40aa - 969d2bc613cc192283ef4d303803df9e39aa40aa + 95fc2394913c830055a4ff25ba13335ccf428332 + 95fc2394913c830055a4ff25ba13335ccf428332 + 95fc2394913c830055a4ff25ba13335ccf428332 + 95fc2394913c830055a4ff25ba13335ccf428332 - 4.4.0-preview2-25331-01 - 2.0.0-preview2-25331-01 - 2.0.0-preview2-25330-02 + 4.4.0-preview2-25331-02 + 2.0.0-preview2-25331-02 + 2.0.0-preview2-25331-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25330-01 + 2.0.0-preview2-25331-01 1.4.1 - 4.4.0-preview2-25330-01 + 4.4.0-preview2-25331-01 From e32e805789abc2954973b05f509a09c4cfb4ea48 Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Wed, 31 May 2017 16:15:00 -0500 Subject: [PATCH 083/198] Improve error message when assembly not found in runtime store (#2572) --- src/corehost/cli/deps_entry.h | 1 + src/corehost/cli/deps_format.cpp | 14 +++++++----- src/corehost/cli/deps_format.h | 5 +++-- src/corehost/cli/deps_resolver.cpp | 22 +++++++++++-------- ...GivenThatICareAboutLightupAppActivation.cs | 8 +++++-- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/src/corehost/cli/deps_entry.h b/src/corehost/cli/deps_entry.h index c228303e..727700d4 100644 --- a/src/corehost/cli/deps_entry.h +++ b/src/corehost/cli/deps_entry.h @@ -21,6 +21,7 @@ struct deps_entry_t static const std::array s_known_asset_types; + pal::string_t deps_file; pal::string_t library_type; pal::string_t library_name; pal::string_t library_version; diff --git a/src/corehost/cli/deps_format.cpp b/src/corehost/cli/deps_format.cpp index 316e14f1..6984f953 100644 --- a/src/corehost/cli/deps_format.cpp +++ b/src/corehost/cli/deps_format.cpp @@ -47,10 +47,13 @@ pal::string_t deps_json_t::get_optional_path( } void deps_json_t::reconcile_libraries_with_targets( + const pal::string_t& deps_path, const json_value& json, const std::function& library_exists_fn, const std::function&(const pal::string_t&, int, bool*)>& get_rel_paths_by_asset_type_fn) { + pal::string_t deps_file = get_filename(deps_path); + const auto& libraries = json.at(_X("libraries")).as_object(); for (const auto& library : libraries) { @@ -98,6 +101,7 @@ void deps_json_t::reconcile_libraries_with_targets( entry.relative_path = rel_path; entry.is_serviceable = serviceable; entry.is_rid_specific = rid_specific; + entry.deps_file = deps_file; // TODO: Deps file does not follow spec. It uses '\\', should use '/' replace_char(&entry.relative_path, _X('\\'), _X('/')); @@ -260,7 +264,7 @@ bool deps_json_t::process_targets(const json_value& json, const pal::string_t& t return true; } -bool deps_json_t::load_portable(const json_value& json, const pal::string_t& target_name, const rid_fallback_graph_t& rid_fallback_graph) +bool deps_json_t::load_portable(const pal::string_t& deps_path, const json_value& json, const pal::string_t& target_name, const rid_fallback_graph_t& rid_fallback_graph) { if (!process_runtime_targets(json, target_name, rid_fallback_graph, &m_rid_assets)) { @@ -302,12 +306,12 @@ bool deps_json_t::load_portable(const json_value& json, const pal::string_t& tar return empty; }; - reconcile_libraries_with_targets(json, package_exists, get_relpaths); + reconcile_libraries_with_targets(deps_path, json, package_exists, get_relpaths); return true; } -bool deps_json_t::load_standalone(const json_value& json, const pal::string_t& target_name) +bool deps_json_t::load_standalone(const pal::string_t& deps_path, const json_value& json, const pal::string_t& target_name) { if (!process_targets(json, target_name, &m_assets)) { @@ -323,7 +327,7 @@ bool deps_json_t::load_standalone(const json_value& json, const pal::string_t& t return m_assets.libs[package].by_type[type_index].vec; }; - reconcile_libraries_with_targets(json, package_exists, get_relpaths); + reconcile_libraries_with_targets(deps_path, json, package_exists, get_relpaths); const auto& json_object = json.as_object(); const auto iter = json_object.find(_X("runtimes")); @@ -414,7 +418,7 @@ bool deps_json_t::load(bool portable, const pal::string_t& deps_path, const rid_ trace::verbose(_X("Loading deps file... %s as portable=[%d]"), deps_path.c_str(), portable); - return (portable) ? load_portable(json, name, rid_fallback_graph) : load_standalone(json, name); + return (portable) ? load_portable(deps_path, json, name, rid_fallback_graph) : load_standalone(deps_path, json, name); } catch (const std::exception& je) { diff --git a/src/corehost/cli/deps_format.h b/src/corehost/cli/deps_format.h index 4341a40e..78b6a4c1 100644 --- a/src/corehost/cli/deps_format.h +++ b/src/corehost/cli/deps_format.h @@ -70,13 +70,14 @@ public: const deps_entry_t& try_ni(const deps_entry_t& entry) const; private: - bool load_standalone(const json_value& json, const pal::string_t& target_name); - bool load_portable(const json_value& json, const pal::string_t& target_name, const rid_fallback_graph_t& rid_fallback_graph); + bool load_standalone(const pal::string_t& deps_path, const json_value& json, const pal::string_t& target_name); + bool load_portable(const pal::string_t& deps_path, const json_value& json, const pal::string_t& target_name, const rid_fallback_graph_t& rid_fallback_graph); bool load(bool portable, const pal::string_t& deps_path, const rid_fallback_graph_t& rid_fallback_graph); bool process_runtime_targets(const json_value& json, const pal::string_t& target_name, const rid_fallback_graph_t& rid_fallback_graph, rid_specific_assets_t* p_assets); bool process_targets(const json_value& json, const pal::string_t& target_name, deps_assets_t* p_assets); void reconcile_libraries_with_targets( + const pal::string_t& deps_path, const json_value& json, const std::function& library_exists_fn, const std::function&(const pal::string_t&, int, bool*)>& get_rel_paths_by_asset_type_fn); diff --git a/src/corehost/cli/deps_resolver.cpp b/src/corehost/cli/deps_resolver.cpp index b6ba1349..cf41401e 100644 --- a/src/corehost/cli/deps_resolver.cpp +++ b/src/corehost/cli/deps_resolver.cpp @@ -262,8 +262,8 @@ bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::str continue; } pal::string_t probe_dir = config.probe_dir; - - if (config.probe_deps_json) + + if (config.probe_deps_json) { // If the deps json has the package name and version, then someone has already done rid selection and // put the right asset in the dir. So checking just package name and version would suffice. @@ -305,15 +305,19 @@ bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::str bool report_missing_assembly_in_manifest(const deps_entry_t& entry) { + trace::error(_X( + "Error:\n" + " An assembly specified in the application dependencies manifest (%s) was not found:\n" + " package: '%s', version: '%s'\n" + " path: '%s'"), + entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + if (!entry.runtime_store_manifest_list.empty()) { - trace::error(_X("Error: assembly specified in the dependencies manifest was not found probably due to missing runtime store associated with %s -- package: '%s', version: '%s', path: '%s'"), - entry.runtime_store_manifest_list.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); - } - else - { - trace::error(_X("Error: assembly specified in the dependencies manifest was not found -- package: '%s', version: '%s', path: '%s'"), - entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + trace::error(_X( + " This assembly was expected to be in the local runtime store as the application was published using the following target manifest files:\n" + " %s"), + entry.runtime_store_manifest_list.c_str()); } return false; diff --git a/src/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs b/src/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs index 861f1ac8..a856bb18 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs @@ -63,11 +63,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.LightupApp dotnet.Exec("exec", "--additional-deps", libDepsJson, appDll) .CaptureStdErr() .CaptureStdOut() - .Execute(fExpectedToFail:true) + .Execute(fExpectedToFail: true) .Should() .Fail() .And - .HaveStdErrContaining("Error: assembly specified in the dependencies manifest was not found -- package: \'LightupLib\', version: \'1.0.0\', path: \'LightupLib.dll\'"); + .HaveStdErrContaining( + "Error:" + Environment.NewLine + + " An assembly specified in the application dependencies manifest (LightupLib.deps.json) was not found:" + Environment.NewLine + + " package: \'LightupLib\', version: \'1.0.0\'" + Environment.NewLine + + " path: \'LightupLib.dll\'"); } // Attempt to run the app with lightup deps.json specified and lightup library present in the expected From 47c006af84203a46125d9e548a96cc49ef2e0daf Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 31 May 2017 16:54:26 -0700 Subject: [PATCH 084/198] Update CoreClr to preview2-25331-03 (#2573) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 32a88635..4d994733 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 95fc2394913c830055a4ff25ba13335ccf428332 - 95fc2394913c830055a4ff25ba13335ccf428332 + eb57d8479181102dea96dd23a4c7e03fa1129246 95fc2394913c830055a4ff25ba13335ccf428332 95fc2394913c830055a4ff25ba13335ccf428332 @@ -18,7 +18,7 @@ 4.4.0-preview2-25331-02 2.0.0-preview2-25331-02 - 2.0.0-preview2-25331-02 + 2.0.0-preview2-25331-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25331-01 1.4.1 From cb309459614ecb168bc34e9b219d530a385d43cd Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 31 May 2017 18:34:38 -0700 Subject: [PATCH 085/198] Update CoreClr to preview2-25401-01 (#2576) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 4d994733..6a30d695 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 95fc2394913c830055a4ff25ba13335ccf428332 - eb57d8479181102dea96dd23a4c7e03fa1129246 + 8488beaa77db7c9194226043d1616488e98eb9b3 95fc2394913c830055a4ff25ba13335ccf428332 95fc2394913c830055a4ff25ba13335ccf428332 @@ -18,7 +18,7 @@ 4.4.0-preview2-25331-02 2.0.0-preview2-25331-02 - 2.0.0-preview2-25331-03 + 2.0.0-preview2-25401-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25331-01 1.4.1 From b26fa05d105111c1187fb2e89e3532d1e694f71d Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 31 May 2017 19:31:18 -0700 Subject: [PATCH 086/198] Update CoreFx to preview2-25401-01 (#2579) --- dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.props b/dependencies.props index 6a30d695..32b38fbd 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,15 +9,15 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 95fc2394913c830055a4ff25ba13335ccf428332 + ea34c9b17ee3b0fe8cf1fad8663e3f2882ea07f8 8488beaa77db7c9194226043d1616488e98eb9b3 95fc2394913c830055a4ff25ba13335ccf428332 95fc2394913c830055a4ff25ba13335ccf428332 - 4.4.0-preview2-25331-02 - 2.0.0-preview2-25331-02 + 4.4.0-preview2-25401-01 + 2.0.0-preview2-25401-01 2.0.0-preview2-25401-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25331-01 From 94900bdec881a21c314ff819df13b618c7589f85 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 31 May 2017 23:25:07 -0700 Subject: [PATCH 087/198] Update CoreClr to preview2-25401-02 (#2580) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 32b38fbd..f80cf5af 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> ea34c9b17ee3b0fe8cf1fad8663e3f2882ea07f8 - 8488beaa77db7c9194226043d1616488e98eb9b3 + ba8cce7f39680946672e327065d26dc7ece5a834 95fc2394913c830055a4ff25ba13335ccf428332 95fc2394913c830055a4ff25ba13335ccf428332 @@ -18,7 +18,7 @@ 4.4.0-preview2-25401-01 2.0.0-preview2-25401-01 - 2.0.0-preview2-25401-01 + 2.0.0-preview2-25401-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25331-01 1.4.1 From ed803065c52b020c50f9deaed533f7474982969f Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 1 Jun 2017 08:02:50 -0700 Subject: [PATCH 088/198] Update CoreFx, Standard, WCF to preview2-25401-02, preview2-25401-01, preview2-25401-01, respectively (#2584) --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index f80cf5af..13797a4e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - ea34c9b17ee3b0fe8cf1fad8663e3f2882ea07f8 + a6407630f7f63db38f7be5a867f6f5c4f904ad31 ba8cce7f39680946672e327065d26dc7ece5a834 - 95fc2394913c830055a4ff25ba13335ccf428332 - 95fc2394913c830055a4ff25ba13335ccf428332 + a6407630f7f63db38f7be5a867f6f5c4f904ad31 + a6407630f7f63db38f7be5a867f6f5c4f904ad31 - 4.4.0-preview2-25401-01 - 2.0.0-preview2-25401-01 + 4.4.0-preview2-25401-02 + 2.0.0-preview2-25401-02 2.0.0-preview2-25401-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25331-01 + 2.0.0-preview2-25401-01 1.4.1 - 4.4.0-preview2-25331-01 + 4.4.0-preview2-25401-01 From b12ec4d0fa7fc80fbc8ef8c32f70fca3d2bb4d94 Mon Sep 17 00:00:00 2001 From: karajas Date: Thu, 1 Jun 2017 12:24:29 -0700 Subject: [PATCH 089/198] Fix DEB installer names (Issue #2588) --- dir.props | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dir.props b/dir.props index 9a4b0a5f..6cb5c7eb 100644 --- a/dir.props +++ b/dir.props @@ -285,10 +285,13 @@ - $(PackagesOutDir)dotnet-runtime- - $(PackagesOutDir)dotnet-host- - $(PackagesOutDir)dotnet-hostfxr- - $(PackagesOutDir)dotnet-runtime- + dotnet-host- + dotnet-hostfxr- + dotnet-runtime- + $(PackagesOutDir)$(DotnetRuntimeString) + $(PackagesOutDir)$(DotnetHostString) + $(PackagesOutDir)$(DotnetHostFxrString) + $(PackagesOutDir)$(DotnetRuntimeString) internal @@ -405,9 +408,9 @@ dotnet-host $(SharedHostDebPkgName.ToLower()) - $([System.IO.Path]::GetFileNameWithoutExtension('$(HostFxrInstallerFile)')) + $(DotnetHostFxrString)$(HostResolverVersion) $(HostFxrDebPkgName.ToLower()) - $([System.IO.Path]::GetFileNameWithoutExtension('$(SharedFrameworkInstallerFile)')) + $(DotnetRuntimeString)$(SharedFrameworkNugetVersion) $(SharedFxDebPkgName.ToLower()) From 5bd9eaa797234a0a4ee7b0b6ef04b40015ebd3ea Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 1 Jun 2017 12:31:50 -0700 Subject: [PATCH 090/198] Update CoreFx to preview2-25401-03 --- dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.props b/dependencies.props index 13797a4e..78fb625a 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,15 +9,15 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - a6407630f7f63db38f7be5a867f6f5c4f904ad31 + 94daf0bf6618555332940e244c0a3711f8239854 ba8cce7f39680946672e327065d26dc7ece5a834 a6407630f7f63db38f7be5a867f6f5c4f904ad31 a6407630f7f63db38f7be5a867f6f5c4f904ad31 - 4.4.0-preview2-25401-02 - 2.0.0-preview2-25401-02 + 4.4.0-preview2-25401-03 + 2.0.0-preview2-25401-03 2.0.0-preview2-25401-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 From b8b3d20eb7b3e6275f3a4ede77c2e49023914198 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Thu, 1 Jun 2017 14:35:53 -0700 Subject: [PATCH 091/198] Update Runtime Installer [Windows] ( release/2.0.0) (#2594) * Removed Eula rich text box Updated package branding Added Welcome and Success page messages Added dummyEula as required by Burn authoring . It doesn't show up in UI. * Fixing the text truncation issue in Welcome page --- src/pkg/packaging/dir.props | 11 +- src/pkg/packaging/windows/package.targets | 2 +- .../windows/sharedframework/bundle.thm | 44 ++-- .../windows/sharedframework/bundle.wxl | 15 +- .../windows/sharedframework/bundle.wxs | 4 +- .../windows/sharedframework/dummyEula.rtf | 237 ++++++++++++++++++ 6 files changed, 287 insertions(+), 26 deletions(-) create mode 100644 src/pkg/packaging/windows/sharedframework/dummyEula.rtf diff --git a/src/pkg/packaging/dir.props b/src/pkg/packaging/dir.props index 708c4096..84e62702 100644 --- a/src/pkg/packaging/dir.props +++ b/src/pkg/packaging/dir.props @@ -23,10 +23,11 @@ - Microsoft .NET Core $(ProductionVersion) - Microsoft .NET Core $(ProductionVersion) $(ReleaseBrandSuffix) - $(ProductBrandPrefix) Host - $(ProductBrandPrefix) Host FX Resolver - $(ProductBrandPrefix) Runtime + Microsoft .NET Core + $(ProductionVersion) + $(ProductionVersion) $(ReleaseBrandSuffix) + $(ProductBrandPrefix) Host - $(ProductBrandSuffix) + $(ProductBrandPrefix) Host FX Resolver - $(ProductBrandSuffix) + $(ProductBrandPrefix) Runtime - $(ProductBrandSuffix) \ No newline at end of file diff --git a/src/pkg/packaging/windows/package.targets b/src/pkg/packaging/windows/package.targets index b2d93a30..e1b7145b 100644 --- a/src/pkg/packaging/windows/package.targets +++ b/src/pkg/packaging/windows/package.targets @@ -96,7 +96,7 @@ $(SharedHostInstallerFile) $(HostFxrInstallerFile) $(CombinedInstallerFile) - $(ProductBrandPrefix) Runtime + $(SharedFrameworkBrandName) "$(MsiArch)" "$(TargetArchitecture)" diff --git a/src/pkg/packaging/windows/sharedframework/bundle.thm b/src/pkg/packaging/windows/sharedframework/bundle.thm index 9c962acd..36275b5e 100644 --- a/src/pkg/packaging/windows/sharedframework/bundle.thm +++ b/src/pkg/packaging/windows/sharedframework/bundle.thm @@ -1,6 +1,6 @@ - #(loc.Caption) + #(loc.Caption) Segoe UI Segoe UI Segoe UI @@ -20,20 +20,21 @@ - - - #(loc.Motto) + - - #(loc.InstallAcceptCheckbox) - + #(loc.WelcomeHeaderMessage) + #(loc.WelcomeDescription) + #(loc.LearnMoreTitle) + #(loc.DocumentationLink) + #(loc.PrivacyStatementLink) + #(loc.MITLicenseLink) - + #(loc.OptionsHeader) #(loc.OptionsLocationLabel) @@ -43,7 +44,7 @@ - + #(loc.FilesInUseHeader) #(loc.FilesInUseLabel) @@ -58,7 +59,7 @@ - + #(loc.ProgressHeader) #(loc.ProgressLabel) @@ -68,7 +69,7 @@ - + #(loc.ModifyHeader) @@ -77,20 +78,29 @@ - + #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) + #(loc.SuccessUninstallHeader) #(loc.SuccessRestartText) + + #(loc.SuccessInstallLocation) + #(loc.SuccessInstallProductName) + #(loc.ResourcesHeader) + #(loc.DocumentationLink) + #(loc.RelaseNotesLink) + #(loc.TutorialLink) + #(loc.TelemetryLink) + - + #(loc.FailureHeader) #(loc.FailureInstallHeader) @@ -102,4 +112,4 @@ - \ No newline at end of file + diff --git a/src/pkg/packaging/windows/sharedframework/bundle.wxl b/src/pkg/packaging/windows/sharedframework/bundle.wxl index 243e8522..c9a8b3a4 100644 --- a/src/pkg/packaging/windows/sharedframework/bundle.wxl +++ b/src/pkg/packaging/windows/sharedframework/bundle.wxl @@ -36,7 +36,7 @@ Ready? Set? Let's go! &Close Repair Successfully Completed Uninstall Successfully Completed - Installation Successfully Completed + Installation was successful Setup Successful &Launch You must restart your computer before you can use the software. @@ -56,4 +56,17 @@ Ready? Set? Let's go! &Do not close applications. A reboot will be required. &OK &Cancel + .NET Core Runtime + .NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it! + Learn more about .NET Core + The following was installed at [DOTNETHOME] + - [BUNDLEMONIKER] + Resources + <A HREF="https://aka.ms/dotnet-docs">Documentation</A> + <A HREF="https://aka.ms/20-p2-rel-notes">Release Notes</A> + <A HREF="https://aka.ms/dotnet-tutorials">Tutorials</A> + <A HREF="https://aka.ms/dotnet-cli-telemetry">.NET Core Telemetry</A> + <A HREF="https://aka.ms/dev-privacy">Privacy Statement</A> + <A HREF="https://aka.ms/dotnet-license">MIT License</A> + diff --git a/src/pkg/packaging/windows/sharedframework/bundle.wxs b/src/pkg/packaging/windows/sharedframework/bundle.wxs index 03a10b86..602149b6 100644 --- a/src/pkg/packaging/windows/sharedframework/bundle.wxs +++ b/src/pkg/packaging/windows/sharedframework/bundle.wxs @@ -17,7 +17,7 @@ @@ -27,7 +27,7 @@ - + diff --git a/src/pkg/packaging/windows/sharedframework/dummyEula.rtf b/src/pkg/packaging/windows/sharedframework/dummyEula.rtf new file mode 100644 index 00000000..ebcd5ac3 --- /dev/null +++ b/src/pkg/packaging/windows/sharedframework/dummyEula.rtf @@ -0,0 +1,237 @@ +{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;} +{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} +{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;} +{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f376\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f377\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f379\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f380\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f381\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f382\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f383\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f384\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f376\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f377\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\f379\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f380\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f381\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f382\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\f383\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f384\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f746\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f747\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\f749\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f750\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f751\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f752\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);} +{\f753\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f754\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;} +{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);} +{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;} +{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;} +{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} +{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} +{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} +{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;} +{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} +{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} +{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}} +{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0; +\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 +\ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \snext11 \ssemihidden \sunhideused +Normal Table;}{\s15\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 \slink16 \sunhideused \styrsid10564401 header;}{\*\cs16 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 +\sbasedon10 \slink15 \slocked \styrsid10564401 Header Char;}{\s17\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext17 \slink18 \sunhideused \styrsid10564401 footer;}{\*\cs18 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 +\sbasedon10 \slink17 \slocked \styrsid10564401 Footer Char;}}{\*\rsidtbl \rsid2163051\rsid10564401}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim0}{\info +{\operator Rakesh Ranjan Singh}{\creatim\yr2017\mo5\dy30\hr17\min38}{\revtim\yr2017\mo5\dy30\hr17\min39}{\version2}{\edmins1}{\nofpages1}{\nofwords28}{\nofchars160}{\nofcharsws187}{\vern37}}{\*\userprops {\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85 +995028c_Enabled}\proptype30{\staticval True}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId}\proptype30{\staticval 72f988bf-86f1-41af-91ab-2d7cd011db47}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Ref}\proptype30 +{\staticval https://api.informationprotection.azure.com/api/72f988bf-86f1-41af-91ab-2d7cd011db47}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetBy}\proptype30{\staticval raksingh@microsoft.com}{\propname MSIP_Label_f42aa342-8706-4288-bd11-e +bb85995028c_SetDate}\proptype30{\staticval 2017-05-30T17:39:57.6592568-07:00}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name}\proptype30{\staticval General}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Application}\proptype30 +{\staticval Microsoft Azure Information Protection}{\propname MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Extended_MSFT_Method}\proptype30{\staticval Automatic}{\propname Sensitivity}\proptype30{\staticval General}}{\*\xmlnstbl {\xmlns1 http://schemas +.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701 +\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot10564401 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar +\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10564401 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 { +\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2163051 \chftnsep +\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10564401 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2163051 \chftnsepc +\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10564401 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2163051 \chftnsep +\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10564401 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2163051 \chftnsepc +\par }}\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\headerl \ltrpar \pard\plain \ltrpar\s15\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\headerr \ltrpar \pard\plain \ltrpar\s15\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\footerl \ltrpar \pard\plain \ltrpar\s17\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\footerr \ltrpar \pard\plain \ltrpar\s17\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\headerf \ltrpar \pard\plain \ltrpar\s15\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\footerf \ltrpar \pard\plain \ltrpar\s17\ql \li0\ri0\widctlpar\tqc\tx4680\tqr\tx9360\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 +\fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid10564401 +\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}} +{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8 +\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\ql \li0\ri0\sa160\sl259\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid10564401 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang1033\langfe1033\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp1033 {\rtlch\fcs1 +\af31507 \ltrch\fcs0 \insrsid10564401 \hich\af31506\dbch\af31505\loch\f31506 This is a dummy file for Eula as required by \hich\af31506\dbch\af31505\loch\f31506 B\hich\af31506\dbch\af31505\loch\f31506 urn bundle \hich\af31506\dbch\af31505\loch\f31506 +. The bal.WixStandardBootstrapperApplication element must hav a value for exactly one of the LicenseFile or LicenseUrl attributes.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \insrsid2163051\charrsid10564401 +\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a +9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad +5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6 +b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0 +0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6 +a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f +c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512 +0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462 +a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865 +6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b +4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b +4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f +7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd +ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d +7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b +d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52 +fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71 +b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b +fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567 +9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd +79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf +5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2 +d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1 +738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68 +2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac +5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a +b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9 +493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2 +be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f +f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64 +7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e +b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4 +6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd +f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d +7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39 +4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf +1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a +faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2 +67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9 +416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27 +1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b +8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4 +8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65 +2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36 +3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e +3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985 +0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000 +0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000 +000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000 +7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000 +000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000 +000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000} +{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d +617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169 +6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363 +656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e} +{\*\latentstyles\lsdstimax375\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6; +\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong; +\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text; +\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2; +\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List; +\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1; +\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision; +\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1; +\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1; +\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2; +\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2; +\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2; +\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3; +\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3; +\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4; +\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4; +\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4; +\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5; +\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5; +\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6; +\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6; +\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6; +\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis; +\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography; +\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4; +\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2; +\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3; +\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4; +\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4; +\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5; +\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5; +\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6; +\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6; +\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3; +\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3; +\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4; +\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4; +\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5; +\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5; +\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6; +\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention; +\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;}}{\*\datastore 010500000200000018000000 +4d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000 +d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000b00a +ec6da6d9d201feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 +000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file From 079367761ed028d0746e58e49f7717593f7ffa9d Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Thu, 1 Jun 2017 14:36:09 -0700 Subject: [PATCH 092/198] Fix CI build failure. Eula.rtf has been removed from OSX packages but dummy Eula is required by Burn authoring (#2593) --- src/pkg/packaging/osx/package.targets | 26 ++++- .../resources/cs.lproj/conclusion.html | 25 +++++ .../resources/cs.lproj/eula.rtf | 97 ------------------- .../resources/cs.lproj/welcome.html | 22 +++++ .../resources/de.lproj/conclusion.html | 25 +++++ .../resources/de.lproj/eula.rtf | 97 ------------------- .../resources/de.lproj/welcome.html | 22 +++++ .../resources/en.lproj/conclusion.html | 24 +++++ .../resources/en.lproj/welcome.html | 21 ++++ .../resources/es.lproj/conclusion.html | 25 +++++ .../resources/es.lproj/eula.rtf | 97 ------------------- .../resources/es.lproj/welcome.html | 22 +++++ .../resources/fr.lproj/conclusion.html | 25 +++++ .../resources/fr.lproj/eula.rtf | 97 ------------------- .../resources/fr.lproj/welcome.html | 22 +++++ .../resources/it.lproj/conclusion.html | 25 +++++ .../resources/it.lproj/eula.rtf | 97 ------------------- .../resources/it.lproj/welcome.html | 22 +++++ .../resources/ja.lproj/conclusion.html | 25 +++++ .../resources/ja.lproj/eula.rtf | 97 ------------------- .../resources/ja.lproj/welcome.html | 22 +++++ .../resources/ko.lproj/conclusion.html | 25 +++++ .../resources/ko.lproj/eula.rtf | 97 ------------------- .../resources/ko.lproj/welcome.html | 22 +++++ .../resources/pl.lproj/conclusion.html | 25 +++++ .../resources/pl.lproj/eula.rtf | 97 ------------------- .../resources/pl.lproj/welcome.html | 22 +++++ .../resources/pt-br.lproj/conclusion.html | 25 +++++ .../resources/pt-br.lproj/eula.rtf | 97 ------------------- .../resources/pt-br.lproj/welcome.html | 22 +++++ .../resources/ru.lproj/eula.rtf | 97 ------------------- .../resources/tr.lproj/eula.rtf | 97 ------------------- .../resources/zh-hans.lproj/eula.rtf | 97 ------------------- .../resources/zh-hant.lproj/eula.rtf | 97 ------------------- ...shared-framework-distribution-template.xml | 2 +- 35 files changed, 494 insertions(+), 1263 deletions(-) create mode 100644 src/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/cs.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/de.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/es.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/fr.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/it.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/ja.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/ko.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/pl.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html create mode 100644 src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/ru.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/tr.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/zh-hans.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/zh-hant.lproj/eula.rtf diff --git a/src/pkg/packaging/osx/package.targets b/src/pkg/packaging/osx/package.targets index 9164e684..4894f46f 100644 --- a/src/pkg/packaging/osx/package.targets +++ b/src/pkg/packaging/osx/package.targets @@ -49,12 +49,36 @@ $(OSXScriptRoot)sharedframework/ - $(SharedFxScriptRoot)resources + $(PackagesIntermediateDir)resources $(CombinedInstallerFile) shared-framework-distribution-template.xml $(PackagesIntermediateDir)$(TemplateFile) + + + + + + + + + + + conclusion.html + + + + + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/cs.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/de.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/de.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/de.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/de.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/de.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html new file mode 100644 index 00000000..40f415ad --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/en.lproj/conclusion.html @@ -0,0 +1,24 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html new file mode 100644 index 00000000..9e9a955f --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/en.lproj/welcome.html @@ -0,0 +1,21 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + diff --git a/src/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/es.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/es.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/es.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/es.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/es.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/fr.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/it.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/it.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/it.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/it.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/it.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/ja.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/ko.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/pl.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html b/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html new file mode 100644 index 00000000..e16c4b31 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/conclusion.html @@ -0,0 +1,25 @@ + + + + + + +
+

The following was installed at /usr/local/share/dotnet +

    +
  • {SharedFxBrandName}
    • +
+
+
+ + + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html b/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html new file mode 100644 index 00000000..d0b0e4f8 --- /dev/null +++ b/src/pkg/packaging/osx/sharedframework/resources/pt-br.lproj/welcome.html @@ -0,0 +1,22 @@ + + + + + + +
+
+

.NET Core Runtime

+

.NET Core is a development platform that you can use to build command-line applications, microservices and modern websites.It is open source, cross-platform, and supported by Microsoft. We hope you enjoy it!

+
+
+

Learn more about .NET Core

+ +
+ + + diff --git a/src/pkg/packaging/osx/sharedframework/resources/ru.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/ru.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/ru.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/tr.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/tr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/tr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/zh-hans.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/zh-hans.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/zh-hans.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/resources/zh-hant.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/zh-hant.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/zh-hant.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml index a9550ce3..899ef94d 100644 --- a/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml +++ b/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml @@ -1,10 +1,10 @@ {SharedFxBrandName} (x64) - + From 5487f29b452c7101c65ac91afafc5856d9e1f364 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 1 Jun 2017 17:42:16 -0700 Subject: [PATCH 093/198] Update CoreClr, CoreFx to preview2-25402-01, preview2-25402-01, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 78fb625a..630c5c41 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 94daf0bf6618555332940e244c0a3711f8239854 - ba8cce7f39680946672e327065d26dc7ece5a834 + 6565d3f0656ef83226e1b63e9ab249709e8a2d4b + 6565d3f0656ef83226e1b63e9ab249709e8a2d4b a6407630f7f63db38f7be5a867f6f5c4f904ad31 a6407630f7f63db38f7be5a867f6f5c4f904ad31 - 4.4.0-preview2-25401-03 - 2.0.0-preview2-25401-03 - 2.0.0-preview2-25401-02 + 4.4.0-preview2-25402-01 + 2.0.0-preview2-25402-01 + 2.0.0-preview2-25402-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 1.4.1 From 3c440c8947e7776b2c7772bcb98b3bc73e1b9193 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 1 Jun 2017 22:11:04 -0700 Subject: [PATCH 094/198] Update CoreClr to preview2-25402-03 (#2600) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 630c5c41..a14f3e7b 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 6565d3f0656ef83226e1b63e9ab249709e8a2d4b - 6565d3f0656ef83226e1b63e9ab249709e8a2d4b + d989f4d3e3a43aeb8bed9a98a97ad73889dcb614 a6407630f7f63db38f7be5a867f6f5c4f904ad31 a6407630f7f63db38f7be5a867f6f5c4f904ad31 @@ -18,7 +18,7 @@ 4.4.0-preview2-25402-01 2.0.0-preview2-25402-01 - 2.0.0-preview2-25402-01 + 2.0.0-preview2-25402-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 1.4.1 From 1768bf1d4c7fd317d4a99d6c0cfba851ff2a61cd Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 5 Jun 2017 11:42:43 -0700 Subject: [PATCH 095/198] Update CoreFx, WCF to preview2-25405-01, preview2-25405-01, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index a14f3e7b..423b430e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 6565d3f0656ef83226e1b63e9ab249709e8a2d4b + 534770cbd98c4083de4d93b809f2e0968f0f856a d989f4d3e3a43aeb8bed9a98a97ad73889dcb614 a6407630f7f63db38f7be5a867f6f5c4f904ad31 - a6407630f7f63db38f7be5a867f6f5c4f904ad31 + 534770cbd98c4083de4d93b809f2e0968f0f856a - 4.4.0-preview2-25402-01 - 2.0.0-preview2-25402-01 + 4.4.0-preview2-25405-01 + 2.0.0-preview2-25405-01 2.0.0-preview2-25402-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 1.4.1 - 4.4.0-preview2-25401-01 + 4.4.0-preview2-25405-01 From c5c194838c3578800006a38f742407b429cee385 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 5 Jun 2017 16:48:51 -0700 Subject: [PATCH 096/198] If the version found in the Global json does not exist; roll forward along patch versions. (#2621) --- src/corehost/cli/fxr/fx_muxer.cpp | 54 +++++++++++- .../GivenThatICareAboutMultilevelSDKLookup.cs | 82 ++++++++++++------- 2 files changed, 102 insertions(+), 34 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 2379c01e..5b3d86d4 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -628,6 +628,50 @@ pal::string_t resolve_sdk_version(pal::string_t sdk_path, bool parse_only_produc return retval; } +pal::string_t resolve_patch_sdk_version(pal::string_t global_cli_version, pal::string_t sdk_path, bool parse_only_production) +{ + fx_ver_t specified(-1, -1, -1); + if (!fx_ver_t::parse(global_cli_version, &specified, false)) + { + trace::error(_X("The specified SDK version '%s' could not be parsed"), global_cli_version.c_str()); + return pal::string_t(); + } + + trace::verbose(_X("--- Resolving SDK version from SDK dir [%s]"), sdk_path.c_str()); + + pal::string_t retval; + std::vector versions; + + pal::readdir(sdk_path, &versions); + fx_ver_t max_ver(-1, -1, -1); + for (const auto& version : versions) + { + trace::verbose(_X("Considering version... [%s]"), version.c_str()); + + fx_ver_t ver(-1, -1, -1); + if (fx_ver_t::parse(version, &ver, parse_only_production)) + { + if (ver.get_major() == specified.get_major() && ver.get_minor() == specified.get_minor()) + { + // Pick the greatest version that differs only in patch. + max_ver = std::max(ver, max_ver); + } + } + } + + pal::string_t max_ver_str = max_ver.as_str(); + append_path(&sdk_path, max_ver_str.c_str()); + + trace::verbose(_X("Checking if resolved SDK dir [%s] exists"), sdk_path.c_str()); + if (pal::directory_exists(sdk_path)) + { + trace::verbose(_X("Resolved SDK dir is [%s]"), sdk_path.c_str()); + retval = max_ver_str; + } + + return retval; +} + bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, pal::string_t* cli_sdk) { trace::verbose(_X("--- Resolving dotnet from working dir")); @@ -726,10 +770,10 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal trace::verbose(_X("Searching SDK directory in [%s]"), dir.c_str()); pal::string_t current_sdk_path = dir; append_path(¤t_sdk_path, _X("sdk")); + bool parse_only_production = false; // false -- implies both production and prerelease. if (global_cli_version.empty()) { - bool parse_only_production = false; // false -- implies both production and prerelease. pal::string_t new_cli_version = resolve_sdk_version(current_sdk_path, parse_only_production); if (higher_sdk_version(new_cli_version, &cli_version, parse_only_production)) { @@ -751,7 +795,11 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } else { - trace::verbose(_X("CLI directory [%s] from global.json doesn't exist"), probing_sdk_path.c_str()); + pal::string_t new_cli_version = resolve_patch_sdk_version(global_cli_version, current_sdk_path, parse_only_production); + if (higher_sdk_version(new_cli_version, &cli_version, parse_only_production)) + { + sdk_path = current_sdk_path; + } } } } @@ -770,7 +818,7 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal } else { - trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), cli_version.c_str(), global.c_str()); + trace::error(_X("The specified SDK version [%s] from global.json [%s] not found; install specified SDK version"), global_cli_version.c_str(), global.c_str()); } return false; } diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 8eb200f3..7140b087 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -167,9 +167,9 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup // Remove dummy folders from user dir DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-dummy"); } - + [Fact] - public void SdkLookup_Global_Json_Versioned_Behaviors() + public void SdkLookup_Global_Json_Patch_Rollup() { var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -180,34 +180,14 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup SetGlobalJsonVersion(); // Add some dummy versions - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.0", "9999.0.0-dummy"); + AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "9999.0.0-dummy"); AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-dummy"); // Specified CLI version: 9999.0.0-global-dummy // CWD: empty - // User: 9999.0.0, 9999.0.0-dummy + // User: 9999.0.1, 9999.0.0-dummy // Exe: 9999.0.0-dummy - // Expected: no compatible version and specific error message - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .Environment(s_DefaultEnvironment) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Fail() - .And - .HaveStdErrContaining("global.json] not found; install specified SDK version"); - - // Add specified CLI version - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-global-dummy"); - - // Specified CLI version: 9999.0.0-global-dummy - // CWD: empty - // User: 9999.0.0, 9999.0.0-dummy - // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy - // Expected: 9999.0.0-global-dummy from exe dir + // Expected: 9999.0.1 from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -218,16 +198,56 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); + + // Add specified CLI version + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.4"); + + // Specified CLI version: 9999.0.0-global-dummy + // CWD: empty + // User: 9999.0.1, 9999.0.0-dummy + // Exe: 9999.0.0-dummy, 9999.0.4 + // Expected: 9999.0.4 from exe dir + dotnet.Exec("help") + .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) + .Environment(s_DefaultEnvironment) + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.4", _dotnetSdkDllMessageTerminator)); + + // Add specified CLI version + AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.6-dummy"); + + // Specified CLI version: 9999.0.0-global-dummy + // CWD: empty + // User: 9999.0.1, 9999.0.0-dummy, 9999.0.6-dummy + // Exe: 9999.0.0-dummy, 9999.0.4 + // Expected: 9999.0.6-dummy from user dir + dotnet.Exec("help") + .WorkingDirectory(_currentWorkingDir) + .WithUserProfile(_userDir) + .Environment(s_DefaultEnvironment) + .CaptureStdOut() + .CaptureStdErr() + .Execute() + .Should() + .Pass() + .And + .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.6-dummy", _dotnetSdkDllMessageTerminator)); // Add more specified CLI versions - AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0-global-dummy"); + AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.8"); AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-global-dummy"); // Specified CLI version: 9999.0.0-global-dummy - // CWD: 9999.0.0-global-dummy --> should not be picked - // User: 9999.0.0, 9999.0.0-dummy; 9999.0.0-global-dummy - // Exe: 9999.0.0-dummy, 9999.0.0-global-dummy + // CWD: 9999.0.8 --> should not be picked + // User: 9999.0.1, 9999.0.0-dummy, 9999.0.6-dummy, 9999.0.0-global-dummy + // Exe: 9999.0.0-dummy, 9999.0.4 // Expected: 9999.0.0-global-dummy from user dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) @@ -242,7 +262,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); // Remove dummy folders from user dir - DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0", "9999.0.0-dummy", "9999.0.0-global-dummy"); + DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "9999.0.0-dummy", "9999.0.6-dummy", "9999.0.0-global-dummy"); } [Fact] From baa69770c40ce13dcb1a8979b288be8cb23f9c7b Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 5 Jun 2017 18:36:18 -0700 Subject: [PATCH 097/198] Disable looking up user-profile and only lookup dotnet EXE location and global location for the SDK. (#2627) --- src/corehost/cli/fxr/fx_muxer.cpp | 8 - src/corehost/common/pal.h | 1 - src/corehost/common/pal.unix.cpp | 22 --- src/corehost/common/pal.windows.cpp | 16 -- .../GivenThatICareAboutMultilevelSDKLookup.cs | 161 ++++-------------- 5 files changed, 33 insertions(+), 175 deletions(-) diff --git a/src/corehost/cli/fxr/fx_muxer.cpp b/src/corehost/cli/fxr/fx_muxer.cpp index 5b3d86d4..d4777e72 100644 --- a/src/corehost/cli/fxr/fx_muxer.cpp +++ b/src/corehost/cli/fxr/fx_muxer.cpp @@ -735,14 +735,6 @@ bool fx_muxer_t::resolve_sdk_dotnet_path(const pal::string_t& own_dir, const pal std::vector global_dirs; bool multilevel_lookup = multilevel_lookup_enabled(); - if (multilevel_lookup) - { - if (pal::get_local_dotnet_dir(&local_dir)) - { - hive_dir.push_back(local_dir); - } - } - if (!own_dir.empty()) { hive_dir.push_back(own_dir); diff --git a/src/corehost/common/pal.h b/src/corehost/common/pal.h index 76fb18ea..ebbafcdb 100644 --- a/src/corehost/common/pal.h +++ b/src/corehost/common/pal.h @@ -210,7 +210,6 @@ namespace pal bool get_own_executable_path(string_t* recv); bool getenv(const char_t* name, string_t* recv); bool get_default_servicing_directory(string_t* recv); - bool get_local_dotnet_dir(string_t* recv); //On Linux, we determine global location by enumerating the location where dotnet is present on path, hence there could be multiple such locations //On Windows there will be only one global location bool get_global_dotnet_dirs(std::vector* recv); diff --git a/src/corehost/common/pal.unix.cpp b/src/corehost/common/pal.unix.cpp index 9f0fb4fe..778d7446 100644 --- a/src/corehost/common/pal.unix.cpp +++ b/src/corehost/common/pal.unix.cpp @@ -217,28 +217,6 @@ bool locate_dotnet_on_path(std::vector* dotnet_exes) return true; } -bool pal::get_local_dotnet_dir(pal::string_t* recv) -{ - recv->clear(); - pal::string_t dir; - if (!pal::getenv("HOME", &dir)) - { - struct passwd* pw = getpwuid(getuid()); - if (pw && pw->pw_dir) - { - dir.assign(pw->pw_dir); - } - } - if (dir.empty()) - { - return false; - } - append_path(&dir, _X(".dotnet")); - append_path(&dir, get_arch()); - recv->assign(dir); - return true; -} - bool pal::get_global_dotnet_dirs(std::vector* recv) { diff --git a/src/corehost/common/pal.windows.cpp b/src/corehost/common/pal.windows.cpp index c7ee63e2..40afb2c3 100644 --- a/src/corehost/common/pal.windows.cpp +++ b/src/corehost/common/pal.windows.cpp @@ -208,22 +208,6 @@ bool pal::get_global_dotnet_dirs(std::vector* dirs) return true; } -bool pal::get_local_dotnet_dir(pal::string_t* dir) -{ - pal::string_t profile; - if (!get_file_path_from_env(_X("USERPROFILE"), &profile)) - { - // We should have the path in profile. - trace::verbose(_X("Failed to obtain user profile directory,[%s]"), profile.c_str()); - return false; - } - - dir->assign(profile); - append_path(dir, _X(".dotnet")); - append_path(dir, get_arch()); - return true; -} - // To determine the OS version, we are going to use RtlGetVersion API // since GetVersion call can be shimmed on Win8.1+. typedef NTSTATUS (WINAPI *pFuncRtlGetVersion)(RTL_OSVERSIONINFOW *); diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs index 7140b087..31b79964 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSDKLookup.cs @@ -45,7 +45,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup string baseMultilevelDir = Path.Combine(artifactsDir, "dotnetMultilevelSDKLookup"); string multilevelDir = CalculateMultilevelDirectory(baseMultilevelDir); - // The three tested locations will be the cwd, the user folder and the exe dir. cwd is no longer supported. + // The three tested locations will be the cwd, the user folder and the exe dir. cwd and user are no longer supported. // Both exe and user dir will be placed inside the multilevel folder _currentWorkingDir = Path.Combine(multilevelDir, "cwd"); @@ -96,77 +96,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup _userSelectedMessage = $"Using dotnet SDK dll=[{_userSdkBaseDir}"; _exeSelectedMessage = $"Using dotnet SDK dll=[{_exeSdkBaseDir}"; } - - [Fact] - public void SdkLookup_Must_Verify_Folders_in_the_Correct_Order() - { - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - - // Add a dummy version in the exe dir - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-dummy"); - - // Specified CLI version: none - // User: empty - // Exe: 9999.0.0 - // Expected: 9999.0.0 from exe dir - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .Environment(s_DefaultEnvironment) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_exeSelectedMessage); - - // Add a dummy version in the user dir - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-dummy"); - - // Specified CLI version: none - // CWD: empty - // User: 9999.0.0 - // Exe: 9999.0.0 - // Expected: 9999.0.0 from user dir - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .Environment(s_DefaultEnvironment) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_userSelectedMessage); - - // Add a dummy version in the cwd - AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.0-dummy"); - - // Specified CLI version: none - // CWD: 9999.0.0 --> should not be picked - // User: 9999.0.0 - // Exe: 9999.0.0 - // Expected: 9999.0.0 from User - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .Environment(s_DefaultEnvironment) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_userSelectedMessage); - - // Remove dummy folders from user dir - DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-dummy"); - } [Fact] public void SdkLookup_Global_Json_Patch_Rollup() @@ -180,14 +109,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup SetGlobalJsonVersion(); // Add some dummy versions - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "9999.0.0-dummy"); - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-dummy"); + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.1", "9999.0.0-dummy"); // Specified CLI version: 9999.0.0-global-dummy // CWD: empty - // User: 9999.0.1, 9999.0.0-dummy - // Exe: 9999.0.0-dummy - // Expected: 9999.0.1 from user dir + // User: empty + // Exe: 9999.0.1, 9999.0.0-dummy + // Expected: 9999.0.1 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -198,15 +126,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); // Add specified CLI version AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.4"); // Specified CLI version: 9999.0.0-global-dummy // CWD: empty - // User: 9999.0.1, 9999.0.0-dummy - // Exe: 9999.0.0-dummy, 9999.0.4 + // User: empty + // Exe: 9999.0.1, 9999.0.0-dummy, 9999.0.4 // Expected: 9999.0.4 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) @@ -221,13 +149,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.4", _dotnetSdkDllMessageTerminator)); // Add specified CLI version - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.6-dummy"); + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.6-dummy"); // Specified CLI version: 9999.0.0-global-dummy // CWD: empty - // User: 9999.0.1, 9999.0.0-dummy, 9999.0.6-dummy - // Exe: 9999.0.0-dummy, 9999.0.4 - // Expected: 9999.0.6-dummy from user dir + // User: empty + // Exe: 9999.0.1, 9999.0.0-dummy, 9999.0.4, 9999.0.6-dummy + // Expected: 9999.0.6-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -238,17 +166,16 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.6-dummy", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.6-dummy", _dotnetSdkDllMessageTerminator)); - // Add more specified CLI versions - AddAvailableSdkVersions(_cwdSdkBaseDir, "9999.0.8"); - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.0-global-dummy"); + // Add specified CLI version + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0-global-dummy"); // Specified CLI version: 9999.0.0-global-dummy - // CWD: 9999.0.8 --> should not be picked - // User: 9999.0.1, 9999.0.0-dummy, 9999.0.6-dummy, 9999.0.0-global-dummy - // Exe: 9999.0.0-dummy, 9999.0.4 - // Expected: 9999.0.0-global-dummy from user dir + // CWD: empty + // User: empty + // Exe: 9999.0.1, 9999.0.0-dummy, 9999.0.4, 9999.0.6-dummy, 9999.0.0-global-dummy + // Expected: 9999.0.0-global-dummy from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -259,10 +186,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); - - // Remove dummy folders from user dir - DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "9999.0.0-dummy", "9999.0.6-dummy", "9999.0.0-global-dummy"); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0-global-dummy", _dotnetSdkDllMessageTerminator)); } [Fact] @@ -274,8 +198,7 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup var dotnet = fixture.BuiltDotnet; // Add dummy versions in the exe dir - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0"); - AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.1-dummy"); + AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.0", "9999.0.1-dummy"); // Specified CLI version: none // CWD: empty @@ -294,12 +217,14 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .And .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1-dummy", _dotnetSdkDllMessageTerminator)); - // Add a dummy version in the exe dir + // Add dummy versions + AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.2"); + AddAvailableSdkVersions(_cwdSdkBaseDir, "10000.0.0"); AddAvailableSdkVersions(_exeSdkBaseDir, "9999.0.1"); // Specified CLI version: none - // CWD: empty - // User: empty + // CWD: 10000.0.0 --> should not be picked + // User: 9999.0.2 --> should not be picked // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1 // Expected: 9999.0.1 from exe dir dotnet.Exec("help") @@ -314,33 +239,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .And .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); - // Add dummy versions - AddAvailableSdkVersions(_userSdkBaseDir, "9999.0.1"); - AddAvailableSdkVersions(_cwdSdkBaseDir, "10000.0.0"); - - // Specified CLI version: none - // CWD: 10000.0.0 --> should not be picked - // User: 9999.0.1 - // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1 - // Expected: 9999.0.1 from user dir - dotnet.Exec("help") - .WorkingDirectory(_currentWorkingDir) - .WithUserProfile(_userDir) - .Environment(s_DefaultEnvironment) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "9999.0.1", _dotnetSdkDllMessageTerminator)); // Add a dummy version in the exe dir AddAvailableSdkVersions(_exeSdkBaseDir, "10000.0.0-dummy"); // Specified CLI version: none // CWD: 10000.0.0 --> should not be picked - // User: 9999.0.1 + // User: 9999.0.2 --> should not be picked // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1, 10000.0.0-dummy // Expected: 10000.0.0-dummy from exe dir dotnet.Exec("help") @@ -356,13 +261,13 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "10000.0.0-dummy", _dotnetSdkDllMessageTerminator)); // Add a dummy version in the user dir - AddAvailableSdkVersions(_userSdkBaseDir, "10000.0.0"); + AddAvailableSdkVersions(_exeSdkBaseDir, "10000.0.0"); // Specified CLI version: none // CWD: 10000.0.0 --> should not be picked - // User: 9999.0.1, 10000.0.0 - // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1, 10000.0.0-dummy - // Expected: 10000.0.0 from user dir + // User: 9999.0.2 --> should not be picked + // Exe: 9999.0.0, 9999.0.1-dummy, 9999.0.1, 10000.0.0-dummy, 10000.0.0 + // Expected: 10000.0.0 from exe dir dotnet.Exec("help") .WorkingDirectory(_currentWorkingDir) .WithUserProfile(_userDir) @@ -373,10 +278,10 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSDKLookup .Should() .Pass() .And - .HaveStdErrContaining(Path.Combine(_userSelectedMessage, "10000.0.0", _dotnetSdkDllMessageTerminator)); + .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "10000.0.0", _dotnetSdkDllMessageTerminator)); // Remove dummy folders from user dir - DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.1", "10000.0.0"); + DeleteAvailableSdkVersions(_userSdkBaseDir, "9999.0.2"); } // This method adds a list of new sdk version folders in the specified From a78ba161e0c06cbc8b4dd94c4c3681da1751ab91 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 7 Jun 2017 09:02:56 -0700 Subject: [PATCH 098/198] Update CoreClr, WCF to preview2-25407-01, preview2-25407-01, respectively (#2645) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 423b430e..966d12c3 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> 534770cbd98c4083de4d93b809f2e0968f0f856a - d989f4d3e3a43aeb8bed9a98a97ad73889dcb614 + bb1b090878210c02de9bf563b5fb2e32db7c6450 a6407630f7f63db38f7be5a867f6f5c4f904ad31 - 534770cbd98c4083de4d93b809f2e0968f0f856a + bb1b090878210c02de9bf563b5fb2e32db7c6450 4.4.0-preview2-25405-01 2.0.0-preview2-25405-01 - 2.0.0-preview2-25402-03 + 2.0.0-preview2-25407-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 1.4.1 - 4.4.0-preview2-25405-01 + 4.4.0-preview2-25407-01 From 90d32973e2a4f63b053190d30080b58797d90e27 Mon Sep 17 00:00:00 2001 From: chcosta Date: Wed, 7 Jun 2017 09:18:15 -0700 Subject: [PATCH 099/198] ensure buildversion.props is evaluated for VersionSuffix (#2646) --- build.proj | 10 ++++++---- restore.proj | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 restore.proj diff --git a/build.proj b/build.proj index c08c0271..47378ea9 100644 --- a/build.proj +++ b/build.proj @@ -14,10 +14,10 @@ - BatchRestorePackages; - ValidateExactRestore; CreateOrUpdateCurrentVersionFile; CreateVersionInfoFile; + BatchRestorePackages; + ValidateExactRestore; BuildCustomTasks; @@ -56,8 +56,10 @@ - - + + diff --git a/restore.proj b/restore.proj new file mode 100644 index 00000000..ae55b08e --- /dev/null +++ b/restore.proj @@ -0,0 +1,10 @@ + + + + + + + + + + From 40c565230930ead58a50719c0ec799df77bddee9 Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Wed, 7 Jun 2017 11:54:08 -0500 Subject: [PATCH 100/198] Remove global location lookup support using PATH in non Windows (#2644) --- src/corehost/common/pal.unix.cpp | 51 +------------------ ...nThatICareAboutMultilevelSharedFxLookup.cs | 29 ++++++++++- src/test/TestUtils/Command.cs | 30 ++--------- src/test/TestUtils/DotNetCli.cs | 3 +- 4 files changed, 33 insertions(+), 80 deletions(-) diff --git a/src/corehost/common/pal.unix.cpp b/src/corehost/common/pal.unix.cpp index 778d7446..1d4ed27c 100644 --- a/src/corehost/common/pal.unix.cpp +++ b/src/corehost/common/pal.unix.cpp @@ -182,57 +182,10 @@ bool is_executable(const pal::string_t& file_path) return ((st.st_mode & S_IEXEC) != 0); } -static -bool locate_dotnet_on_path(std::vector* dotnet_exes) -{ - pal::string_t path; - if (!pal::getenv(_X("PATH"), &path)) - { - return false; - } - - pal::string_t tok; - pal::stringstream_t ss(path); - while (std::getline(ss, tok, PATH_SEPARATOR)) - { - size_t start_pos = tok.find_first_not_of(_X(" \t")); - if (start_pos == pal::string_t::npos) - { - continue; - } - - append_path(&tok, _X("dotnet")); - if (pal::realpath(&tok) && is_executable(tok)) - { - dotnet_exes->push_back(tok); - } - tok.clear(); - } - - if (dotnet_exes->empty()) - { - return false; - } - - return true; -} - bool pal::get_global_dotnet_dirs(std::vector* recv) { - - std::vector dotnet_exes; - if (!locate_dotnet_on_path(&dotnet_exes)) - { - return false; - } - - for (pal::string_t path : dotnet_exes) - { - pal::string_t dir = get_directory(path); - recv->push_back(dir); - } - - return true; + // No support for global directories in Unix. + return false; } pal::string_t trim_quotes(pal::string_t stringToCleanup) diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs index 5b311991..b9161980 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs @@ -169,6 +169,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku { return; } + else + { + // Currently no support for global locations on Linux; remaining test code below is preserved for now. + return; + } var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -415,6 +420,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku { return; } + else + { + // Currently no support for global locations on Linux; remaining test code below is preserved for now. + return; + } var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -481,6 +491,11 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku { return; } + else + { + // Currently no support for global locations on Linux; remaining test code below is preserved for now. + return; + } var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -529,7 +544,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku { return; } - + else + { + // Currently no support for global locations on Linux; remaining test code below is preserved for now. + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); @@ -595,7 +615,12 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku { return; } - + else + { + // Currently no support for global locations on Linux; remaining test code below is preserved for now. + return; + } + var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture .Copy(); diff --git a/src/test/TestUtils/Command.cs b/src/test/TestUtils/Command.cs index 4f536358..0e1114e6 100644 --- a/src/test/TestUtils/Command.cs +++ b/src/test/TestUtils/Command.cs @@ -238,41 +238,17 @@ namespace Microsoft.DotNet.Cli.Build.Framework _process.StartInfo.Environment[userDir] = userprofile; return this; } - public Command SanitizeGlobalLocation() - { - if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows) - { - var current_path = _process.StartInfo.Environment["PATH"]; - var new_path = new System.Text.StringBuilder(); - //Remove any global dotnet that has been set - foreach (var sub_path in current_path.Split(Path.PathSeparator)) - { - var candidate = Path.Combine(sub_path, "dotnet"); - if (!File.Exists(candidate)) - { - new_path.Append(sub_path); - new_path.Append(Path.PathSeparator); - } - } - _process.StartInfo.Environment["PATH"] = new_path.ToString(); - } - return this; - } + public Command WithGlobalLocation(string global) { - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) { - throw new NotImplementedException("Global location override needs work "); + throw new NotImplementedException("Global location override needs test improvements for Windows"); } else { - var current_path = _process.StartInfo.Environment["PATH"]; - _process.StartInfo.Environment["PATH"] = current_path + Path.PathSeparator + global; + throw new NotSupportedException("Global location override not supported for Linux"); } - - - return this; } public Command EnvironmentVariable(string name, string value) diff --git a/src/test/TestUtils/DotNetCli.cs b/src/test/TestUtils/DotNetCli.cs index 48b46373..c7d1d817 100644 --- a/src/test/TestUtils/DotNetCli.cs +++ b/src/test/TestUtils/DotNetCli.cs @@ -31,8 +31,7 @@ namespace Microsoft.DotNet.Cli.Build } return Command.Create(Path.Combine(BinPath, $"dotnet{Constants.ExeSuffix}"), newArgs) - .EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1") - .SanitizeGlobalLocation(); + .EnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1"); } public Command Restore(params string[] args) => Exec("restore", args); From e3782b36f6fc6f89ea47d01bcee2811dc3b58f47 Mon Sep 17 00:00:00 2001 From: chcosta Date: Thu, 8 Jun 2017 13:46:10 -0700 Subject: [PATCH 101/198] Sign PlatformAbstractions and DependencyModel binaries (#2652) * Sign PlatformAbstractions and DependencyModel * Use pre-existing property * minor fix, end property value with a slash --- src/dir.props | 2 +- src/managed/dir.proj | 1 + src/pkg/packaging/dir.proj | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/dir.props b/src/dir.props index 39af4dea..cd3eb817 100644 --- a/src/dir.props +++ b/src/dir.props @@ -4,7 +4,7 @@ $(CoreHostOutputDir)locked\ - $(IntermediateOutputRootPath)forPackaging + $(IntermediateOutputRootPath)sign/forPackaging/ diff --git a/src/managed/dir.proj b/src/managed/dir.proj index 69ec1759..c3804a56 100644 --- a/src/managed/dir.proj +++ b/src/managed/dir.proj @@ -16,6 +16,7 @@ /p:Configuration=$(ConfigurationGroup) $(BuildArgs) /p:LatestCommit=$(LatestCommit) $(BuildArgs) /p:BuiltByString="$(BuiltByString)" + $(BuildArgs) /p:BaseOutputPath=$(IntermediateOutputForPackaging) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 45ac56ff..3276c0cd 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -171,7 +171,7 @@ --version-suffix $(VersionSuffix) - From 5f4474683d2964c3e5c5271c941f33e7d9db4629 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Mon, 12 Jun 2017 16:23:52 -0700 Subject: [PATCH 102/198] Update CoreClr, WCF to preview3-25412-01, preview2-25412-01, respectively (#2674) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 966d12c3..33d4a079 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> 534770cbd98c4083de4d93b809f2e0968f0f856a - bb1b090878210c02de9bf563b5fb2e32db7c6450 + c40a501a36c1c328057fb4a31e3baa685f746d5f a6407630f7f63db38f7be5a867f6f5c4f904ad31 - bb1b090878210c02de9bf563b5fb2e32db7c6450 + c40a501a36c1c328057fb4a31e3baa685f746d5f 4.4.0-preview2-25405-01 2.0.0-preview2-25405-01 - 2.0.0-preview2-25407-01 + 2.0.0-preview3-25412-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview2-25401-01 1.4.1 - 4.4.0-preview2-25407-01 + 4.4.0-preview2-25412-01 From 16fac4d294271d6109307220efd6140a65bc7bca Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Mon, 12 Jun 2017 16:30:41 -0700 Subject: [PATCH 103/198] Move to Preview3 . Also, remove branchinfo.txt . As we have moved to new build tools, this file is no more used at all. (#2673) --- branchinfo.txt | 12 ------------ dir.props | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 branchinfo.txt diff --git a/branchinfo.txt b/branchinfo.txt deleted file mode 100644 index aaf0f94d..00000000 --- a/branchinfo.txt +++ /dev/null @@ -1,12 +0,0 @@ -# This is a file containing environment variables specific to this branch. -# Any line that is not blank and does not start with '#' is interpreted as a variable to set. -# Each line is expected to be in the format "[Name]=[Value]". -MAJOR_VERSION=2 -MINOR_VERSION=0 -PATCH_VERSION=0 -STABILIZE_PACKAGE_VERSION=false -LOCK_HOST_VERSION=false -RELEASE_SUFFIX=preview2 -RELEASEBRANDING_SUFFIX=Preview 2 -CHANNEL=release/2.0.0 -BRANCH_NAME=release/2.0.0 \ No newline at end of file diff --git a/dir.props b/dir.props index 6cb5c7eb..5144c794 100644 --- a/dir.props +++ b/dir.props @@ -15,9 +15,9 @@ 0 0 false - preview2 + preview3 $(PreReleaseLabel) - Preview 2 + Preview 3 release/2.0.0 release/2.0.0 From 9ca5b198db5170adca58b5eca736c8e9f1da2948 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 13 Jun 2017 13:33:42 -0700 Subject: [PATCH 104/198] Update CoreFx, Standard, WCF to preview3-25413-02, preview3-25413-01, preview2-25413-01, respectively (#2681) --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index 33d4a079..b97eed3c 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 534770cbd98c4083de4d93b809f2e0968f0f856a + 50692f7d935d509253cf8aaa2b0c5dbea975dffc c40a501a36c1c328057fb4a31e3baa685f746d5f - a6407630f7f63db38f7be5a867f6f5c4f904ad31 - c40a501a36c1c328057fb4a31e3baa685f746d5f + 50692f7d935d509253cf8aaa2b0c5dbea975dffc + 50692f7d935d509253cf8aaa2b0c5dbea975dffc - 4.4.0-preview2-25405-01 - 2.0.0-preview2-25405-01 + 4.4.0-preview3-25413-02 + 2.0.0-preview3-25413-02 2.0.0-preview3-25412-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview2-25401-01 + 2.0.0-preview3-25413-01 1.4.1 - 4.4.0-preview2-25412-01 + 4.4.0-preview2-25413-01 From c7792b3ded959d88dd7e567481ff944eb07f1777 Mon Sep 17 00:00:00 2001 From: rakeshsinghranchi Date: Tue, 13 Jun 2017 15:47:53 -0700 Subject: [PATCH 105/198] Fix issue 2682 - Homepage referenced in deb metadata is incorrect (#2683) --- src/pkg/packaging/deb/dotnet-hostfxr-debian_config.json | 2 +- src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json | 2 +- src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkg/packaging/deb/dotnet-hostfxr-debian_config.json b/src/pkg/packaging/deb/dotnet-hostfxr-debian_config.json index 5a4b1add..98c5a734 100644 --- a/src/pkg/packaging/deb/dotnet-hostfxr-debian_config.json +++ b/src/pkg/packaging/deb/dotnet-hostfxr-debian_config.json @@ -7,7 +7,7 @@ "short_description": "%HOSTFXR_BRAND_NAME% %HOSTFXR_NUGET_VERSION%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dotnet.github.io/core", + "homepage": "https://dotnet.github.io", "release":{ "package_version":"1.0.0.0", diff --git a/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json b/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json index f714ca39..b6ffcbee 100644 --- a/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json +++ b/src/pkg/packaging/deb/dotnet-sharedframework-debian_config.json @@ -7,7 +7,7 @@ "short_description": "%SHARED_FRAMEWORK_BRAND_NAME% %SHARED_FRAMEWORK_NUGET_NAME% %SHARED_FRAMEWORK_NUGET_VERSION%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dotnet.github.io/core", + "homepage": "https://dotnet.github.io", "release":{ "package_version":"1.0.0.0", diff --git a/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json b/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json index 9b14a615..d3fe6e56 100644 --- a/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json +++ b/src/pkg/packaging/deb/dotnet-sharedhost-debian_config.json @@ -7,7 +7,7 @@ "short_description": "%SHARED_HOST_BRAND_NAME%", "long_description": ".NET Core is a development platform that you can use to build command-line applications, microservices and modern websites. It is open source, cross-platform and is supported by Microsoft. We hope you enjoy using it! If you do, please consider joining the active community of developers that are contributing to the project on GitHub (https://github.com/dotnet/core). We happily accept issues and PRs.", - "homepage": "https://dotnet.github.io/core", + "homepage": "https://dotnet.github.io", "release":{ "package_version":"1.0.0.0", From 3deacce50c74e3ba28e3d72e2cbcdde3dbb3b9dc Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 13 Jun 2017 16:50:08 -0700 Subject: [PATCH 106/198] Update CoreClr to preview3-25413-01 (#2685) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index b97eed3c..1f00a95c 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 50692f7d935d509253cf8aaa2b0c5dbea975dffc - c40a501a36c1c328057fb4a31e3baa685f746d5f + f03072a8a508407fc160f0bad5da42e8170b9c90 50692f7d935d509253cf8aaa2b0c5dbea975dffc 50692f7d935d509253cf8aaa2b0c5dbea975dffc @@ -18,7 +18,7 @@ 4.4.0-preview3-25413-02 2.0.0-preview3-25413-02 - 2.0.0-preview3-25412-01 + 2.0.0-preview3-25413-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25413-01 1.4.1 From c0ae3b29da1b03b7d2d1dfbff07772384c473c05 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 14 Jun 2017 07:52:56 -0700 Subject: [PATCH 107/198] Update CoreFx, Standard, WCF to preview3-25414-02, preview3-25414-01, preview2-25414-02, respectively (#2688) --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index 1f00a95c..6333692e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 50692f7d935d509253cf8aaa2b0c5dbea975dffc + 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa f03072a8a508407fc160f0bad5da42e8170b9c90 - 50692f7d935d509253cf8aaa2b0c5dbea975dffc - 50692f7d935d509253cf8aaa2b0c5dbea975dffc + 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa + 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa - 4.4.0-preview3-25413-02 - 2.0.0-preview3-25413-02 + 4.4.0-preview3-25414-02 + 2.0.0-preview3-25414-02 2.0.0-preview3-25413-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25413-01 + 2.0.0-preview3-25414-01 1.4.1 - 4.4.0-preview2-25413-01 + 4.4.0-preview2-25414-02 From f75dbc3c4fb0aec63f62357161c80ca5a787a5d4 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 14 Jun 2017 16:16:02 -0700 Subject: [PATCH 108/198] Update CoreClr to preview3-25414-02 (#2693) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 6333692e..698b57b2 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa - f03072a8a508407fc160f0bad5da42e8170b9c90 + ea872a880463cb17e55bebe7c302689a1c4a74b5 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa @@ -18,7 +18,7 @@ 4.4.0-preview3-25414-02 2.0.0-preview3-25414-02 - 2.0.0-preview3-25413-01 + 2.0.0-preview3-25414-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25414-01 1.4.1 From 0fb328316c72fef971a096d14f93b2474290210e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 15 Jun 2017 08:42:42 -0700 Subject: [PATCH 109/198] Update CoreClr, CoreFx, Standard to preview3-25415-01, preview3-25415-01, preview3-25415-01, respectively (#2694) --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index 698b57b2..1526a1fb 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,18 +9,18 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa - ea872a880463cb17e55bebe7c302689a1c4a74b5 - 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa + cfa02ebe38639071ef9172ac554553f6aa5dfde1 + cfa02ebe38639071ef9172ac554553f6aa5dfde1 + cfa02ebe38639071ef9172ac554553f6aa5dfde1 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa - 4.4.0-preview3-25414-02 - 2.0.0-preview3-25414-02 - 2.0.0-preview3-25414-02 + 4.4.0-preview3-25415-01 + 2.0.0-preview3-25415-01 + 2.0.0-preview3-25415-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25414-01 + 2.0.0-preview3-25415-01 1.4.1 4.4.0-preview2-25414-02 From 4bdeb92e38453cc90c9f5fe5dfb729d7a3b978e3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 15 Jun 2017 16:05:51 -0700 Subject: [PATCH 110/198] Update CoreClr, WCF to preview3-25415-02, preview2-25415-02, respectively (#2695) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 1526a1fb..d7eda8a4 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> cfa02ebe38639071ef9172ac554553f6aa5dfde1 - cfa02ebe38639071ef9172ac554553f6aa5dfde1 + 4278de0eea7872e2ad56063b46076f32cc10a21d cfa02ebe38639071ef9172ac554553f6aa5dfde1 - 5bbc01e57f192a9acd4ea9e682a002a2e5c605aa + 4278de0eea7872e2ad56063b46076f32cc10a21d 4.4.0-preview3-25415-01 2.0.0-preview3-25415-01 - 2.0.0-preview3-25415-01 + 2.0.0-preview3-25415-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25415-01 1.4.1 - 4.4.0-preview2-25414-02 + 4.4.0-preview2-25415-02 From 319ab26f7bc660cf47b0abd60b4fad032231bbe6 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 16 Jun 2017 06:17:00 -0700 Subject: [PATCH 111/198] Update CoreClr, CoreFx to preview3-25416-01, preview3-25416-01, respectively (#2696) --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index d7eda8a4..504e7da1 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - cfa02ebe38639071ef9172ac554553f6aa5dfde1 - 4278de0eea7872e2ad56063b46076f32cc10a21d + 79b24f340dbd03b6a4c642daf45f88173d19f1ff + 79b24f340dbd03b6a4c642daf45f88173d19f1ff cfa02ebe38639071ef9172ac554553f6aa5dfde1 4278de0eea7872e2ad56063b46076f32cc10a21d - 4.4.0-preview3-25415-01 - 2.0.0-preview3-25415-01 - 2.0.0-preview3-25415-02 + 4.4.0-preview3-25416-01 + 2.0.0-preview3-25416-01 + 2.0.0-preview3-25416-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25415-01 1.4.1 From e069349e5000f1c5a58f1012543f8934bf411b3e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 16 Jun 2017 11:01:52 -0700 Subject: [PATCH 112/198] Update CoreFx, Standard, WCF to preview3-25416-02, preview3-25416-01, preview2-25416-01, respectively (#2700) --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index 504e7da1..6cc38241 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 79b24f340dbd03b6a4c642daf45f88173d19f1ff + 9ef65bbe889f1ff226709217c889d8cae66b00dc 79b24f340dbd03b6a4c642daf45f88173d19f1ff - cfa02ebe38639071ef9172ac554553f6aa5dfde1 - 4278de0eea7872e2ad56063b46076f32cc10a21d + 9ef65bbe889f1ff226709217c889d8cae66b00dc + 9ef65bbe889f1ff226709217c889d8cae66b00dc - 4.4.0-preview3-25416-01 - 2.0.0-preview3-25416-01 + 4.4.0-preview3-25416-02 + 2.0.0-preview3-25416-02 2.0.0-preview3-25416-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25415-01 + 2.0.0-preview3-25416-01 1.4.1 - 4.4.0-preview2-25415-02 + 4.4.0-preview2-25416-01 From 387dac53a2d86f54df7b5cb2b55621c8f79ae747 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 16 Jun 2017 17:32:40 -0700 Subject: [PATCH 113/198] Update CoreClr to preview3-25416-03 (#2701) --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 6cc38241..9d98714e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,7 +10,7 @@ --> 9ef65bbe889f1ff226709217c889d8cae66b00dc - 79b24f340dbd03b6a4c642daf45f88173d19f1ff + 4bd9711171c9021a26f5f54948b7f7b9ad0eafda 9ef65bbe889f1ff226709217c889d8cae66b00dc 9ef65bbe889f1ff226709217c889d8cae66b00dc @@ -18,7 +18,7 @@ 4.4.0-preview3-25416-02 2.0.0-preview3-25416-02 - 2.0.0-preview3-25416-01 + 2.0.0-preview3-25416-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25416-01 1.4.1 From 372089e4b5c95b1011a74297d714837ee6becc64 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 16 Jun 2017 19:40:18 -0700 Subject: [PATCH 114/198] Update CoreFx to preview3-25417-01 (#2702) --- dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.props b/dependencies.props index 9d98714e..521838a1 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,15 +9,15 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 9ef65bbe889f1ff226709217c889d8cae66b00dc + 879da93888414e07a44fa339b34ebc0f39315725 4bd9711171c9021a26f5f54948b7f7b9ad0eafda 9ef65bbe889f1ff226709217c889d8cae66b00dc 9ef65bbe889f1ff226709217c889d8cae66b00dc - 4.4.0-preview3-25416-02 - 2.0.0-preview3-25416-02 + 4.4.0-preview3-25417-01 + 2.0.0-preview3-25417-01 2.0.0-preview3-25416-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25416-01 From c7a8a80bf106ba45c96af0f3a70f78dcaa16374d Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Sat, 17 Jun 2017 08:06:43 -0700 Subject: [PATCH 115/198] Update CoreClr, Standard to preview3-25417-02, preview3-25417-01, respectively (#2703) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 521838a1..8fcd49a3 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,17 +10,17 @@ --> 879da93888414e07a44fa339b34ebc0f39315725 - 4bd9711171c9021a26f5f54948b7f7b9ad0eafda - 9ef65bbe889f1ff226709217c889d8cae66b00dc + 49b7eb27790c1dace085a0b6de23f34b7aa93bfa + 49b7eb27790c1dace085a0b6de23f34b7aa93bfa 9ef65bbe889f1ff226709217c889d8cae66b00dc 4.4.0-preview3-25417-01 2.0.0-preview3-25417-01 - 2.0.0-preview3-25416-03 + 2.0.0-preview3-25417-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25416-01 + 2.0.0-preview3-25417-01 1.4.1 4.4.0-preview2-25416-01 From 2fab74ca0ab629adfe1291e3f1b5eeae2a57c156 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 19 Jun 2017 07:30:28 -0700 Subject: [PATCH 116/198] Update CoreClr, Standard, WCF to preview3-25419-01, preview3-25419-01, preview2-25419-01, respectively (#2704) --- dependencies.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.props b/dependencies.props index 8fcd49a3..f5531d0a 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> 879da93888414e07a44fa339b34ebc0f39315725 - 49b7eb27790c1dace085a0b6de23f34b7aa93bfa - 49b7eb27790c1dace085a0b6de23f34b7aa93bfa - 9ef65bbe889f1ff226709217c889d8cae66b00dc + ff3cf83534fbce0ef3334a25439945a62af7041a + ff3cf83534fbce0ef3334a25439945a62af7041a + ff3cf83534fbce0ef3334a25439945a62af7041a 4.4.0-preview3-25417-01 2.0.0-preview3-25417-01 - 2.0.0-preview3-25417-02 + 2.0.0-preview3-25419-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25417-01 + 2.0.0-preview3-25419-01 1.4.1 - 4.4.0-preview2-25416-01 + 4.4.0-preview2-25419-01 From 10f235e47521bb578e38430bb9cd18029d82b3ca Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 20 Jun 2017 11:37:41 -0700 Subject: [PATCH 117/198] Update CoreClr, Standard, WCF to preview3-25420-01, preview3-25420-01, preview3-25420-01, respectively (#2706) --- dependencies.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.props b/dependencies.props index f5531d0a..1625018f 100644 --- a/dependencies.props +++ b/dependencies.props @@ -10,19 +10,19 @@ --> 879da93888414e07a44fa339b34ebc0f39315725 - ff3cf83534fbce0ef3334a25439945a62af7041a - ff3cf83534fbce0ef3334a25439945a62af7041a - ff3cf83534fbce0ef3334a25439945a62af7041a + d5662b245f5bd3100be3bb7ed794865654b2457b + d5662b245f5bd3100be3bb7ed794865654b2457b + d5662b245f5bd3100be3bb7ed794865654b2457b 4.4.0-preview3-25417-01 2.0.0-preview3-25417-01 - 2.0.0-preview3-25419-01 + 2.0.0-preview3-25420-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25419-01 + 2.0.0-preview3-25420-01 1.4.1 - 4.4.0-preview2-25419-01 + 4.4.0-preview3-25420-01 From 85eedae4a3ea853a12bf701c8f2a5cc98f9905be Mon Sep 17 00:00:00 2001 From: Matt Ellis Date: Wed, 7 Jun 2017 22:31:50 -0700 Subject: [PATCH 118/198] Use MIT license on *NIX and MSFT License on Windows We can't use the MIT license for our Windows zip's or msi's because we include closed source stuff (windows api set shims, native diasymreader and the ucrt). However, on *nix, everything we redist is open source and licensed as MIT (or covered by the ThirdPartyNotices.txt file). --- resources/LICENSE-MIT.txt | 22 ++++ resources/{LICENSE.txt => LICENSE-MSFT.txt} | 0 src/pkg/packaging/LICENSE.txt | 64 ------------ src/pkg/packaging/dir.proj | 9 +- .../osx/hostfxr/resources/de.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/en.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/es.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/fr.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/it.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/ja.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/ko.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/pl.lproj/eula.rtf | 97 ------------------ .../hostfxr/resources/pt-br.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/ru.lproj/eula.rtf | 97 ------------------ .../osx/hostfxr/resources/tr.lproj/eula.rtf | 97 ------------------ .../hostfxr/resources/zh-hans.lproj/eula.rtf | 97 ------------------ .../hostfxr/resources/zh-hant.lproj/eula.rtf | 97 ------------------ src/pkg/packaging/osx/package.targets | 3 +- .../packaging/osx/resources/cs.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/de.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/en.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/es.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/fr.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/it.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/ja.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/ko.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/pl.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx/resources/pt-br.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/ru.lproj/eula.rtf | Bin 0 -> 1291 bytes .../packaging/osx/resources/tr.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx/resources/zh-hans.lproj/eula.rtf | Bin 0 -> 1291 bytes .../osx/resources/zh-hant.lproj/eula.rtf | Bin 0 -> 1291 bytes .../resources/en.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/cs.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/de.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/en.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/es.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/fr.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/it.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/ja.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/ko.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/pl.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/pt-br.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/ru.lproj/eula.rtf | 97 ------------------ .../sharedhost/resources/tr.lproj/eula.rtf | 97 ------------------ .../resources/zh-hans.lproj/eula.rtf | 97 ------------------ .../resources/zh-hant.lproj/eula.rtf | 97 ------------------ .../resources/cs.lproj => windows}/eula.rtf | 0 .../packaging/windows/host/generatemsi.ps1 | 2 +- .../packaging/windows/hostfxr/generatemsi.ps1 | 2 +- .../sharedframework/generatebundle.ps1 | 2 +- .../windows/sharedframework/generatemsi.ps1 | 2 +- 52 files changed, 35 insertions(+), 2787 deletions(-) create mode 100644 resources/LICENSE-MIT.txt rename resources/{LICENSE.txt => LICENSE-MSFT.txt} (100%) delete mode 100644 src/pkg/packaging/LICENSE.txt delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/de.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/en.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/es.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/fr.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/it.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/ja.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/ko.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/pl.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/ru.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/tr.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/cs.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/de.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/en.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/es.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/fr.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/it.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/ja.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/ko.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/pl.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/ru.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/tr.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf create mode 100644 src/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedframework/resources/en.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/cs.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/de.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/en.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/es.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/fr.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/it.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/ja.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/ko.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/pl.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/pt-br.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/ru.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/tr.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/zh-hans.lproj/eula.rtf delete mode 100644 src/pkg/packaging/osx/sharedhost/resources/zh-hant.lproj/eula.rtf rename src/pkg/packaging/{osx/hostfxr/resources/cs.lproj => windows}/eula.rtf (100%) diff --git a/resources/LICENSE-MIT.txt b/resources/LICENSE-MIT.txt new file mode 100644 index 00000000..cd10d697 --- /dev/null +++ b/resources/LICENSE-MIT.txt @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 .NET Foundation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/resources/LICENSE.txt b/resources/LICENSE-MSFT.txt similarity index 100% rename from resources/LICENSE.txt rename to resources/LICENSE-MSFT.txt diff --git a/src/pkg/packaging/LICENSE.txt b/src/pkg/packaging/LICENSE.txt deleted file mode 100644 index 592b527d..00000000 --- a/src/pkg/packaging/LICENSE.txt +++ /dev/null @@ -1,64 +0,0 @@ -MICROSOFT SOFTWARE LICENSE TERMS -MICROSOFT .NET LIBRARY -These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft - * updates, - * supplements, - * Internet-based services, and - * support services -for this software, unless other terms accompany those items. If so, those terms apply. -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE. -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW. -1. INSTALLATION AND USE RIGHTS. - a. Installation and Use. You may install and use any number of copies of the software to design, develop and test your programs. - b. Third Party Programs. The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only. -2. DATA. The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services. You can learn more about data collection and use in the help documentation and the privacy statement at http://go.microsoft.com/fwlink/?LinkId=528096.Your use of the software operates as your consent to these practices. -3. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. - a. DISTRIBUTABLE CODE.  The software is comprised of Distributable Code. “Distributable Code” is code that you are permitted to distribute in programs you develop if you comply with the terms below. - i. Right to Use and Distribute. - * You may copy and distribute the object code form of the software. - * Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs. - ii. Distribution Requirements. For any Distributable Code you distribute, you must - * add significant primary functionality to it in your programs; - * require distributors and external end users to agree to terms that protect it at least as much as this agreement; - * display your valid copyright notice on your programs; and - * indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, related to the distribution or use of your programs. - iii. Distribution Restrictions. You may not - * alter any copyright, trademark or patent notice in the Distributable Code; - * use Microsoft’s trademarks in your programs’ names or in a way that suggests your programs come from or are endorsed by Microsoft; - * include Distributable Code in malicious, deceptive or unlawful programs; or - * modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that - * the code be disclosed or distributed in source code form; or - * others have the right to modify it. -4. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not - * work around any technical limitations in the software; - * reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation; - * publish the software for others to copy; - * rent, lease or lend the software; - * transfer the software or this agreement to any third party; or - * use the software for commercial software hosting services. -5. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the software. -6. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes. -7. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see www.microsoft.com/exporting. -8. SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it. -9. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services. -10. APPLICABLE LAW. - a. United States. If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort. - b. Outside the United States. If you acquired the software in any other country, the laws of that country apply. -11. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so. -12. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED “AS-IS.” YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -FOR AUSTRALIA – YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS. -13. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES. -This limitation applies to - * anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and - * claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law. -It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages. -Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French. -Remarque : Ce logiciel étant distribué au Québec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en français. -EXONÉRATION DE GARANTIE. Le logiciel visé par une licence est offert « tel quel ». Toute utilisation de ce logiciel est à votre seule risque et péril. Microsoft n’accorde aucune autre garantie expresse. Vous pouvez bénéficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualité marchande, d’adéquation à un usage particulier et d’absence de contrefaçon sont exclues. -LIMITATION DES DOMMAGES-INTÉRÊTS ET EXCLUSION DE RESPONSABILITÉ POUR LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement à hauteur de 5,00 $ US. Vous ne pouvez prétendre à aucune indemnisation pour les autres dommages, y compris les dommages spéciaux, indirects ou accessoires et pertes de bénéfices. -Cette limitation concerne : - * tout ce qui est relié au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et - * les réclamations au titre de violation de contrat ou de garantie, ou au titre de responsabilité stricte, de négligence ou d’une autre faute dans la limite autorisée par la loi en vigueur. -Elle s’applique également, même si Microsoft connaissait ou devrait connaître l’éventualité d’un tel dommage. Si votre pays n’autorise pas l’exclusion ou la limitation de responsabilité pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l’exclusion ci-dessus ne s’appliquera pas à votre égard. -EFFET JURIDIQUE. Le présent contrat décrit certains droits juridiques. Vous pourriez avoir d’autres droits prévus par les lois de votre pays. Le présent contrat ne modifie pas les droits que vous confèrent les lois de votre pays si celles-ci ne le permettent pas. - diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 3276c0cd..534e9502 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -32,8 +32,13 @@ - + + + diff --git a/src/pkg/packaging/osx/hostfxr/resources/de.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/de.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/de.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/en.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/en.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/en.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/es.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/es.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/es.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/fr.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/fr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/fr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/it.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/it.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/it.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/ja.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/ja.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/ja.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/ko.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/ko.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/ko.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/pl.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/pl.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/pl.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/pt-br.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/ru.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/ru.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/ru.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/tr.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/tr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/tr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/zh-hans.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/eula.rtf b/src/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/hostfxr/resources/zh-hant.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/package.targets b/src/pkg/packaging/osx/package.targets index 4894f46f..ece2ced3 100644 --- a/src/pkg/packaging/osx/package.targets +++ b/src/pkg/packaging/osx/package.targets @@ -60,6 +60,7 @@ Directories="$(ResourcePath)" /> + - \ No newline at end of file + diff --git a/src/pkg/packaging/osx/resources/cs.lproj/eula.rtf b/src/pkg/packaging/osx/resources/cs.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/de.lproj/eula.rtf b/src/pkg/packaging/osx/resources/de.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/en.lproj/eula.rtf b/src/pkg/packaging/osx/resources/en.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/es.lproj/eula.rtf b/src/pkg/packaging/osx/resources/es.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/fr.lproj/eula.rtf b/src/pkg/packaging/osx/resources/fr.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/it.lproj/eula.rtf b/src/pkg/packaging/osx/resources/it.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/ja.lproj/eula.rtf b/src/pkg/packaging/osx/resources/ja.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/ko.lproj/eula.rtf b/src/pkg/packaging/osx/resources/ko.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/pl.lproj/eula.rtf b/src/pkg/packaging/osx/resources/pl.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf b/src/pkg/packaging/osx/resources/pt-br.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/ru.lproj/eula.rtf b/src/pkg/packaging/osx/resources/ru.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/tr.lproj/eula.rtf b/src/pkg/packaging/osx/resources/tr.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf b/src/pkg/packaging/osx/resources/zh-hans.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf b/src/pkg/packaging/osx/resources/zh-hant.lproj/eula.rtf new file mode 100644 index 0000000000000000000000000000000000000000..47d886627aea432bf12ee1f8ea70dd82253ab788 GIT binary patch literal 1291 zcmZ8h&2Hm15bilZ-eHhaQV6c>G+VSiDK;GwD@z7NZyG=sN}?>bGHHm^8bOeE?~qnf zYym?yhcn;b2!1OE*Un3!tqPC&beJz57G)#bHZHXpRc($Z;e4SN`Y@00@88PSXy>XP zf5c_0RbRGsCk88B3`^0gYEXZ^zh7Uyl|PpUspTM?8Gxy}lg%QAc|40}^N0A${d@Uc z$@4!-H@}u+J%{V7@+5|)v|$MmVg^s2kyw(U-oR9FEFbJcF{($w5}Ha2SMkvWcJ_ zqy*D~H+GN_I0Hhz!buJm2TbLJ(n=pdK#hF9({%`AP3z8Lkl5USu-4Q{ARaWP9*ErYGoSoO+w5j4s}SEIvD>x&`R$ou#OmuF?)djy5LgV+Dm zg&xm>*&zQEQQ$py=J=x%jHn$4jg%M)&NK!i3ygou+WCrC-kQEQXK$@Gx>4S*{o}GV zj@P0x-(~P~*|Rnd<%Y<^5`vJ+W~VFL3DjT7DKzB9h<)k95;`0!>u~uB^FNs(aQ@%w zY|^kHP~>a=oG=2kfE~-f(G^+2O;X_bCW2?mH~F3ecCaMlFOaVx$zI?q%~lbRzjlli z1>_9qc9&9uHJUBc{fcH!@Q8C+j;}VwcN#%?4jc(5C`xc{4O_yN8$?bXX-fG^1Z&DO zkGV$B1a=AIbh%Fx2D?4mC3{rQg1%+G zdtvlx!(o%BD}u#Gg36M|lw7FL)G|%zHiA{MO`g0u20035p>0z4ydj~4d#y>}&X+a`L7%hAtYnCItj}s?+W|^PM$OXkm9aMjA1Y3Mydo=y2Wkr${ Rv2Z=v56#m?@z3g~e*xH;p{xJ^ literal 0 HcmV?d00001 diff --git a/src/pkg/packaging/osx/sharedframework/resources/en.lproj/eula.rtf b/src/pkg/packaging/osx/sharedframework/resources/en.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedframework/resources/en.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/cs.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/cs.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/cs.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/de.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/de.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/de.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/en.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/en.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/en.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/es.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/es.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/es.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/fr.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/fr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/fr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/it.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/it.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/it.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/ja.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/ja.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/ja.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/ko.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/ko.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/ko.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/pl.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/pl.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/pl.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/pt-br.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/pt-br.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/pt-br.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/ru.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/ru.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/ru.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/tr.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/tr.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/tr.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/zh-hans.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/zh-hans.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/zh-hans.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/sharedhost/resources/zh-hant.lproj/eula.rtf b/src/pkg/packaging/osx/sharedhost/resources/zh-hant.lproj/eula.rtf deleted file mode 100644 index 7f40e11a..00000000 --- a/src/pkg/packaging/osx/sharedhost/resources/zh-hant.lproj/eula.rtf +++ /dev/null @@ -1,97 +0,0 @@ -{\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1033\deflangfe1033{\fonttbl{\f0\fswiss\fprq2\fcharset0 Tahoma;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\froman\fprq2\fcharset0 Times New Roman;}{\f3\fswiss\fprq2\fcharset0 Calibri;}} -{\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Riched20 10.0.10586}{\*\mmathPr\mnaryLim0\mdispDef1\mwrapIndent1440 }\viewkind4\uc1 -\pard\widctlpar\sb120\sa120\cf1\b\f0\fs24 MICROSOFT SOFTWARE LICENSE TERMS\fs28\par -\fs24 MICROSOFT .NET LIBRARY\fs28\par -\fs19 These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 updates,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 supplements,\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 Internet-based services, and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 support services\par - -\pard\widctlpar\sb120\sa120\b for this software, unless other terms accompany those items. If so, those terms apply.\par -BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE.\par -IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 1.\b0\f2\fs14\~\~\~\~\b\f0\fs19 INSTALLATION AND USE RIGHTS.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Installation and Use.\b0\fs20\~You may install and use any number of copies of the software to design, develop and test your programs.\b\fs19\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Third Party Programs.\b0\fs20\~The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only.\b\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 2.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DATA.\~\kerning0\b0\fs20 The software may collect information about you and your use of the software, and send that to Microsoft. Microsoft may use this information to improve our products and services.\~You can learn more about data collection and use in the help documentation and the privacy statement at\~{\cf0\f3\fs24{\field{\*\fldinst{HYPERLINK "http://go.microsoft.com/fwlink/?LinkId=528096&clcid=0x409"}}{\fldrslt{\ul\cf2\cf2\ul\f0\fs20 http://go.microsoft.com/fwlink/?LinkId=528096}}}}\f0\fs20 . Your use of the software operates as your consent to these practices.\kerning36\b\fs19\par -\fs20 3.\b0\f2\fs14\~\~\~\~\b\f0\fs20 ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.\fs19\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs20 DISTRIBUTABLE CODE.\~\~\b0 The software is comprised of Distributable Code. \ldblquote Distributable Code\rdblquote is code that you are permitted to distribute in programs you develop if you comply with the terms below.\b\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\fs20 i.\b0\f2\fs14\~\~\~\~\~\~\b\f0\fs20 Right to Use and Distribute.\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 You may copy and distribute the object code form of the software.\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 ii.\b0\f2\fs14\~\~\~\~\b\f0\fs20 Distribution Requirements.\b0\~\b For any Distributable Code you distribute, you must\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 add significant primary functionality to it in your programs;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 require distributors and external end users to agree to terms that protect it at least as much as this agreement;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 display your valid copyright notice on your programs; and\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 indemnify, defend, and hold harmless Microsoft from any claims, including attorneys\rquote fees, related to the distribution or use of your programs.\fs19\par - -\pard\widctlpar\fi-357\li1077\sb120\sa120\b\fs20 iii.\b0\f2\fs14\~\~\~\b\f0\fs20 Distribution Restrictions.\b0\~\b You may not\b0\fs19\par - -\pard\widctlpar\fi-357\li1434\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 alter any copyright, trademark or patent notice in the Distributable Code;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 use Microsoft\rquote s trademarks in your programs\rquote names or in a way that suggests your programs come from or are endorsed by Microsoft;\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 include Distributable Code in malicious, deceptive or unlawful programs; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that\fs19\par - -\pard\widctlpar\fi-358\li1792\sb120\sa120\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 the code be disclosed or distributed in source code form; or\fs19\par -\f1\fs20\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs20 others have the right to modify it.\fs19\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 4.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SCOPE OF LICENSE.\~\b0 The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not\b\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\b0\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 work around any technical limitations in the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 publish the software for others to copy;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 rent, lease or lend the software;\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 transfer the software or this agreement to any third party; or\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 use the software for commercial software hosting services.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 5.\b0\f2\fs14\~\~\~\~\b\f0\fs19 BACKUP COPY.\~\b0 You may make one backup copy of the software. You may use it only to reinstall the software.\b\par -\fs20 6.\b0\f2\fs14\~\~\~\~\b\f0\fs19 DOCUMENTATION.\~\b0 Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes.\b\par -\fs20 7.\b0\f2\fs14\~\~\~\~\b\f0\fs19 EXPORT RESTRICTIONS.\~\b0 The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see\~{\cf0\fs20{\field{\*\fldinst{HYPERLINK www.microsoft.com/exporting }}{\fldrslt{www.microsoft.com/exporting\ul0\cf0}}}}\f0\fs19 .\b\par -\fs20 8.\b0\f2\fs14\~\~\~\~\b\f0\fs19 SUPPORT SERVICES.\~\b0 Because this software is \ldblquote as is,\rdblquote we may not provide support services for it.\b\par -\fs20 9.\b0\f2\fs14\~\~\~\~\b\f0\fs19 ENTIRE AGREEMENT.\~\b0 This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services.\b\par -\fs20 10.\b0\f2\fs14\~\~\~\b\f0\fs19 APPLICABLE LAW.\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\kerning0\fs20 a.\b0\f2\fs14\~\~\~\~\b\f0\fs19 United States.\~\b0 If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort.\b\par -\fs20 b.\b0\f2\fs14\~\~\~\~\b\f0\fs19 Outside the United States. If you acquired the software in any other country, the laws of that country apply.\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\fs20 11.\b0\f2\fs14\~\~\b\f0\fs19 LEGAL EFFECT.\~\b0 This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so.\b\par -\fs20 12.\b0\f2\fs14\~\~\b\f0\fs19 DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED \ldblquote AS-IS.\rdblquote YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0 FOR AUSTRALIA \endash YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS.\b0\par - -\pard\widctlpar\fi-357\li357\sb120\sa120\kerning36\b\fs20 13.\b0\f2\fs14\~\~\b\f0\fs19 LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.\par - -\pard\widctlpar\li357\sb120\sa120\kerning0\b0 This limitation applies to\par - -\pard\widctlpar\fi-363\li720\sb120\sa120\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and\par -\f1\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law.\par - -\pard\widctlpar\sb120\sa120 It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages.\par -\lang9 Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French.\lang1033\par -\lang9 Remarque : Ce logiciel \'e9tant distribu\'e9 au Qu\'e9bec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en fran\'e7ais.\lang1033\par -\kerning36\b EXON\'c9RATION DE GARANTIE.\~\b0 Le logiciel vis\'e9 par une licence est offert \'ab tel quel \'bb. Toute utilisation de ce logiciel est \'e0 votre seule risque et p\'e9ril. Microsoft n\rquote accorde aucune autre garantie expresse. Vous pouvez b\'e9n\'e9ficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualit\'e9 marchande, d\rquote ad\'e9quation \'e0 un usage particulier et d\rquote absence de contrefa\'e7on sont exclues.\b\par -LIMITATION DES DOMMAGES-INT\'c9R\'caTS ET EXCLUSION DE RESPONSABILIT\'c9 POUR LES DOMMAGES.\~\b0 Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement \'e0 hauteur de 5,00 $ US. Vous ne pouvez pr\'e9tendre \'e0 aucune indemnisation pour les autres dommages, y compris les dommages sp\'e9ciaux, indirects ou accessoires et pertes de b\'e9n\'e9fices.\b\par -\kerning0\b0\lang9 Cette limitation concerne :\lang1033\par - -\pard\widctlpar\li720\sb120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 tout ce qui est reli\'e9 au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et\lang1033\par - -\pard\widctlpar\li720\sa120\f1\lang9\'b7\f2\fs14\~\~\~\~\~\~\~\~\~\f0\fs19 les r\'e9clamations au titre de violation de contrat ou de garantie, ou au titre de responsabilit\'e9 stricte, de n\'e9gligence ou d\rquote une autre faute dans la limite autoris\'e9e par la loi en vigueur.\lang1033\par - -\pard\widctlpar\sb120\sa120\lang9 Elle s\rquote applique \'e9galement, m\'eame si Microsoft connaissait ou devrait conna\'eetre l\rquote\'e9ventualit\'e9 d\rquote un tel dommage. Si votre pays n\rquote autorise pas l\rquote exclusion ou la limitation de responsabilit\'e9 pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l\rquote exclusion ci-dessus ne s\rquote appliquera pas \'e0 votre \'e9gard.\lang1033\par -\kerning36\b EFFET JURIDIQUE.\~\b0 Le pr\'e9sent contrat d\'e9crit certains droits juridiques. Vous pourriez avoir d\rquote autres droits pr\'e9vus par les lois de votre pays. Le pr\'e9sent contrat ne modifie pas les droits que vous conf\'e8rent les lois de votre pays si celles-ci ne le permettent pas.\b\par -\kerning0\fs20\lang1036\~\fs19\lang1033\par - -\pard\widctlpar\cf0\b0\f3\fs24\par -} - \ No newline at end of file diff --git a/src/pkg/packaging/osx/hostfxr/resources/cs.lproj/eula.rtf b/src/pkg/packaging/windows/eula.rtf similarity index 100% rename from src/pkg/packaging/osx/hostfxr/resources/cs.lproj/eula.rtf rename to src/pkg/packaging/windows/eula.rtf diff --git a/src/pkg/packaging/windows/host/generatemsi.ps1 b/src/pkg/packaging/windows/host/generatemsi.ps1 index 29287318..12166428 100644 --- a/src/pkg/packaging/windows/host/generatemsi.ps1 +++ b/src/pkg/packaging/windows/host/generatemsi.ps1 @@ -35,7 +35,7 @@ function RunCandle -out "$WixObjRoot\" ` -ext WixDependencyExtension.dll ` -dHostSrc="$SharedHostPublishRoot" ` - -dMicrosoftEula="$PackagingRoot\osx\sharedhost\resources\en.lproj\eula.rtf" ` + -dMicrosoftEula="$PackagingRoot\windows\eula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$SharedHostMSIVersion" ` -dNugetVersion="$SharedHostNugetVersion" ` diff --git a/src/pkg/packaging/windows/hostfxr/generatemsi.ps1 b/src/pkg/packaging/windows/hostfxr/generatemsi.ps1 index ea16b968..3e67c72e 100644 --- a/src/pkg/packaging/windows/hostfxr/generatemsi.ps1 +++ b/src/pkg/packaging/windows/hostfxr/generatemsi.ps1 @@ -68,7 +68,7 @@ function RunCandle .\candle.exe -nologo ` -out "$WixObjRoot\" ` -dHostFxrSrc="$HostFxrPublishRoot" ` - -dMicrosoftEula="$PackagingRoot\osx\hostfxr\resources\en.lproj\eula.rtf" ` + -dMicrosoftEula="$PackagingRoot\windows\eula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$HostFxrMSIVersion" ` -dNugetVersion="$HostFxrNugetVersion" ` diff --git a/src/pkg/packaging/windows/sharedframework/generatebundle.ps1 b/src/pkg/packaging/windows/sharedframework/generatebundle.ps1 index 58971380..5172d084 100644 --- a/src/pkg/packaging/windows/sharedframework/generatebundle.ps1 +++ b/src/pkg/packaging/windows/sharedframework/generatebundle.ps1 @@ -37,7 +37,7 @@ function RunCandleForBundle $SharedFrameworkComponentVersion = $SharedFrameworkNugetVersion.Replace('-', '_'); .\candle.exe -nologo ` - -dMicrosoftEula="$PackagingRoot\osx\sharedframework\resources\en.lproj\eula.rtf" ` + -dMicrosoftEula="$PackagingRoot\windows\eula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dBuildVersion="$DotnetMSIVersion" ` -dDisplayVersion="$DotnetCLIVersion" ` diff --git a/src/pkg/packaging/windows/sharedframework/generatemsi.ps1 b/src/pkg/packaging/windows/sharedframework/generatemsi.ps1 index a958343f..e4cd3855 100644 --- a/src/pkg/packaging/windows/sharedframework/generatemsi.ps1 +++ b/src/pkg/packaging/windows/sharedframework/generatemsi.ps1 @@ -68,7 +68,7 @@ function RunCandle .\candle.exe -nologo ` -out "$WixObjRoot\" ` -dSharedFrameworkSource="$SharedFrameworkPublishRoot" ` - -dMicrosoftEula="$PackagingRoot\osx\sharedframework\resources\en.lproj\eula.rtf" ` + -dMicrosoftEula="$PackagingRoot\windows\eula.rtf" ` -dProductMoniker="$ProductMoniker" ` -dFrameworkName="$SharedFrameworkNugetName" ` -dFrameworkDisplayVersion="$SharedFrameworkNugetVersion" ` From 4c43bedec763ccfeb71e18a1830228b3c748fde3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 23 Jun 2017 06:33:03 -0700 Subject: [PATCH 119/198] Update CoreClr, CoreFx, Standard, WCF to preview3-25423-01, preview3-25423-02, preview3-25423-01, preview3-25423-01, respectively --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index 1625018f..a37eeafe 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 879da93888414e07a44fa339b34ebc0f39315725 - d5662b245f5bd3100be3bb7ed794865654b2457b - d5662b245f5bd3100be3bb7ed794865654b2457b - d5662b245f5bd3100be3bb7ed794865654b2457b + 74dea96ab5ea41c8553f57656d1521c612d9942f + 74dea96ab5ea41c8553f57656d1521c612d9942f + 74dea96ab5ea41c8553f57656d1521c612d9942f + 74dea96ab5ea41c8553f57656d1521c612d9942f - 4.4.0-preview3-25417-01 - 2.0.0-preview3-25417-01 - 2.0.0-preview3-25420-01 + 4.4.0-preview3-25423-02 + 2.0.0-preview3-25423-02 + 2.0.0-preview3-25423-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25420-01 + 2.0.0-preview3-25423-01 1.4.1 - 4.4.0-preview3-25420-01 + 4.4.0-preview3-25423-01 From 122309e7e7fb9bb233fe4910f822c28ec73f0957 Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Fri, 23 Jun 2017 16:02:49 -0500 Subject: [PATCH 120/198] Allow missing satellite assemblies (#2717) (#2731) --- src/corehost/cli/deps_resolver.cpp | 62 ++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 16 deletions(-) diff --git a/src/corehost/cli/deps_resolver.cpp b/src/corehost/cli/deps_resolver.cpp index cf41401e..60a2ea3e 100644 --- a/src/corehost/cli/deps_resolver.cpp +++ b/src/corehost/cli/deps_resolver.cpp @@ -13,6 +13,16 @@ #include "fx_ver.h" #include "libhost.h" +const pal::string_t MissingAssemblyMessage = _X( + "%s:\n" + " An assembly specified in the application dependencies manifest (%s) was not found:\n" + " package: '%s', version: '%s'\n" + " path: '%s'"); + +const pal::string_t ManifestListMessage = _X( + " This assembly was expected to be in the local runtime store as the application was published using the following target manifest files:\n" + " %s"); + namespace { // ----------------------------------------------------------------------------- @@ -303,25 +313,47 @@ bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::str return false; } -bool report_missing_assembly_in_manifest(const deps_entry_t& entry) +bool report_missing_assembly_in_manifest(const deps_entry_t& entry, bool continueResolving = false) { - trace::error(_X( - "Error:\n" - " An assembly specified in the application dependencies manifest (%s) was not found:\n" - " package: '%s', version: '%s'\n" - " path: '%s'"), - entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + bool showManifestListMessage = !entry.runtime_store_manifest_list.empty(); - if (!entry.runtime_store_manifest_list.empty()) + if (entry.asset_type == deps_entry_t::asset_types::resources) { - trace::error(_X( - " This assembly was expected to be in the local runtime store as the application was published using the following target manifest files:\n" - " %s"), - entry.runtime_store_manifest_list.c_str()); + // Treat missing resource assemblies as informational. + continueResolving = true; + + trace::info(MissingAssemblyMessage.c_str(), _X("Info"), + entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + + if (showManifestListMessage) + { + trace::info(ManifestListMessage.c_str(), entry.runtime_store_manifest_list.c_str()); + } + } + else if (continueResolving) + { + trace::warning(MissingAssemblyMessage.c_str(), _X("Warning"), + entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + + if (showManifestListMessage) + { + trace::warning(ManifestListMessage.c_str(), entry.runtime_store_manifest_list.c_str()); + } + } + else + { + trace::error(MissingAssemblyMessage.c_str(), _X("Error"), + entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); + + if (showManifestListMessage) + { + trace::error(ManifestListMessage.c_str(), entry.runtime_store_manifest_list.c_str()); + } } - return false; + return continueResolving; } + /** * Resovle the TPA assembly locations */ @@ -583,9 +615,7 @@ bool deps_resolver_t::resolve_probe_dirs( // because of rid-fallback could happen (ex: CentOS falling back to RHEL) if ((entry.asset_name == _X("apphost")) && ends_with(entry.library_name, _X(".Microsoft.NETCore.DotNetAppHost"), false)) { - trace::warning(_X("Warning: assembly specified in the dependencies manifest was not found -- package: '%s', version: '%s', path: '%s'"), - entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str()); - return true; + return report_missing_assembly_in_manifest(entry, true); } return report_missing_assembly_in_manifest(entry); From c146641a8bc3a9238880a3ac9e4e5e07b6b0a6bc Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 26 Jun 2017 06:26:38 -0700 Subject: [PATCH 121/198] Update CoreClr, CoreFx, Standard to preview3-25426-01, preview3-25426-02, preview3-25426-01, respectively --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index a37eeafe..feb5c287 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,18 +9,18 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 74dea96ab5ea41c8553f57656d1521c612d9942f - 74dea96ab5ea41c8553f57656d1521c612d9942f - 74dea96ab5ea41c8553f57656d1521c612d9942f + d7f47fb37c5ff0371870f9c289d99c106fc72bd3 + d7f47fb37c5ff0371870f9c289d99c106fc72bd3 + d7f47fb37c5ff0371870f9c289d99c106fc72bd3 74dea96ab5ea41c8553f57656d1521c612d9942f - 4.4.0-preview3-25423-02 - 2.0.0-preview3-25423-02 - 2.0.0-preview3-25423-01 + 4.4.0-preview3-25426-02 + 2.0.0-preview3-25426-02 + 2.0.0-preview3-25426-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25423-01 + 2.0.0-preview3-25426-01 1.4.1 4.4.0-preview3-25423-01 From cd5cc13ddb8b883a91cddff9a183833bb5a1485e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 29 Jun 2017 06:51:48 -0700 Subject: [PATCH 122/198] Update CoreClr, CoreFx, Standard, WCF to preview3-25429-01, preview3-25429-02, preview3-25429-01, preview3-25429-01, respectively --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index feb5c287..9d15af6a 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - d7f47fb37c5ff0371870f9c289d99c106fc72bd3 - d7f47fb37c5ff0371870f9c289d99c106fc72bd3 - d7f47fb37c5ff0371870f9c289d99c106fc72bd3 - 74dea96ab5ea41c8553f57656d1521c612d9942f + 1fe7c7d184f7ce426c693574510a652cc95c1b0f + 1fe7c7d184f7ce426c693574510a652cc95c1b0f + 1fe7c7d184f7ce426c693574510a652cc95c1b0f + 1fe7c7d184f7ce426c693574510a652cc95c1b0f - 4.4.0-preview3-25426-02 - 2.0.0-preview3-25426-02 - 2.0.0-preview3-25426-01 + 4.4.0-preview3-25429-02 + 2.0.0-preview3-25429-02 + 2.0.0-preview3-25429-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25426-01 + 2.0.0-preview3-25429-01 1.4.1 - 4.4.0-preview3-25423-01 + 4.4.0-preview3-25429-01 From 932167d4103b052f35e395d9ae262cef678f7a7f Mon Sep 17 00:00:00 2001 From: Chad Nedzlek Date: Mon, 3 Jul 2017 16:11:12 -0700 Subject: [PATCH 123/198] Increase timeout to allow core-setup downloads to complete These builds download a huge amount of data by opening literally hundreds of simultaneous connections. In the official build logs, some of these requests end up at the end of the queue and timeout while waiting their turn. Most of those eventually get a turn, but some of them don't. I'm raising the timeout 6 fold (the default timeout is 100 seconds), and hoping that's enough. --- .../Microsoft.DotNet.Build.Tasks.Local/DownloadBlobFromAzure.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/DownloadBlobFromAzure.cs b/tools-local/Microsoft.DotNet.Build.Tasks.Local/DownloadBlobFromAzure.cs index 81af14c4..f1e3331a 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/DownloadBlobFromAzure.cs +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/DownloadBlobFromAzure.cs @@ -53,6 +53,7 @@ namespace Microsoft.DotNet.Build.Tasks using (HttpClient client = new HttpClient()) { + client.Timeout = TimeSpan.FromMinutes(10); try { Func createRequest = () => From 5016ed50c5b95cecaa6def70e8c20c183d57401f Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 30 Jun 2017 15:57:37 -0500 Subject: [PATCH 124/198] Push packages before finalize, for latest.version The publish target can fail (during download or push) which makes latest.version unreliable as a semaphore. Pushing before writing the file makes it reliable. (cherry picked from commit d8b9e0a5c7c33d488be85343994f7d1b27da638c) --- publish/publish.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/publish.proj b/publish/publish.proj index 31aed2ba..2ee5bfea 100644 --- a/publish/publish.proj +++ b/publish/publish.proj @@ -11,7 +11,7 @@ + DependsOnTargets="PublishCoreHostPackagesToFeed;FinalizeBuildInAzure;UpdatePublishedVersions" /> From d506c26fff450bee6140df39e162d221d2df0224 Mon Sep 17 00:00:00 2001 From: Bill Wert Date: Wed, 5 Jul 2017 15:10:08 -0700 Subject: [PATCH 125/198] Fix install block (#2769) (#2791) Installation block doesn't work due to a typo. Also update to 10.12 as minimum version --- .../shared-framework-distribution-template.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml b/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml index 899ef94d..e5273f0f 100644 --- a/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml +++ b/src/pkg/packaging/osx/sharedframework/shared-framework-distribution-template.xml @@ -6,9 +6,9 @@ - - - + + + From 15da113e52d48c50ff8852ce269bebd13d7471f9 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 5 Jul 2017 16:01:39 -0700 Subject: [PATCH 126/198] Update CoreClr, CoreFx, Standard, WCF to preview3-25505-01, preview3-25505-02, preview3-25505-01, preview3-25503-01, respectively (#2760) --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index 9d15af6a..7e620fe7 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 1fe7c7d184f7ce426c693574510a652cc95c1b0f - 1fe7c7d184f7ce426c693574510a652cc95c1b0f - 1fe7c7d184f7ce426c693574510a652cc95c1b0f - 1fe7c7d184f7ce426c693574510a652cc95c1b0f + c1ea043aefee0ebcc56c298358953eaf26ff985a + c1ea043aefee0ebcc56c298358953eaf26ff985a + c1ea043aefee0ebcc56c298358953eaf26ff985a + c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25429-02 - 2.0.0-preview3-25429-02 - 2.0.0-preview3-25429-01 + 4.4.0-preview3-25505-02 + 2.0.0-preview3-25505-02 + 2.0.0-preview3-25505-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25429-01 + 2.0.0-preview3-25505-01 1.4.1 - 4.4.0-preview3-25429-01 + 4.4.0-preview3-25503-01 From 0405c5caf159ede40aa59e15a9ff56b8f86a16d0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 10 Jul 2017 18:22:57 -0700 Subject: [PATCH 127/198] Update CoreClr, CoreFx, Standard, WCF to preview3-25510-01, preview3-25511-01, preview3-25507-01, preview3-25510-01, respectively --- dependencies.props | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dependencies.props b/dependencies.props index 7e620fe7..85f5f6be 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,20 +9,20 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - c1ea043aefee0ebcc56c298358953eaf26ff985a - c1ea043aefee0ebcc56c298358953eaf26ff985a - c1ea043aefee0ebcc56c298358953eaf26ff985a - c1ea043aefee0ebcc56c298358953eaf26ff985a + c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 - 4.4.0-preview3-25505-02 - 2.0.0-preview3-25505-02 - 2.0.0-preview3-25505-01 + 4.4.0-preview3-25511-01 + 2.0.0-preview3-25511-01 + 2.0.0-preview3-25510-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25505-01 + 2.0.0-preview3-25507-01 1.4.1 - 4.4.0-preview3-25503-01 + 4.4.0-preview3-25510-01 From 670a812aa75bffd80619ba1d58e94e5aa29c645b Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 11 Jul 2017 09:15:01 -0700 Subject: [PATCH 128/198] Disable WCF dependency updates WCF dependency updates are only necessary for UWP which we aren't shipping from the .NET Core 2.0 release branch. --- dependencies.props | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 85f5f6be..fea6f222 100644 --- a/dependencies.props +++ b/dependencies.props @@ -12,9 +12,9 @@ c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 - c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + c1ea043aefee0ebcc56c298358953eaf26ff985a - + 4.4.0-preview3-25511-01 2.0.0-preview3-25511-01 @@ -22,9 +22,9 @@ $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 - 4.4.0-preview3-25510-01 + 4.4.0-preview3-25503-01 - + build-info/dotnet/ @@ -45,15 +45,18 @@ $(BaseDotNetBuildInfo)standard/$(DependencyBranch) $(StandardCurrentRef) + https://raw.githubusercontent.com/dotnet/versions - + $(MSBuildThisFileFullPath) CoreFxVersion @@ -74,10 +77,13 @@ NETStandardVersion NETStandard.Library + From 82345609e34e4408305e7c59eb40a7e988b3c3c8 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 11 Jul 2017 09:18:31 -0700 Subject: [PATCH 129/198] Exclude UWP packages as they aren't shipping with release/2.0.0 --- src/pkg/packages.builds | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pkg/packages.builds b/src/pkg/packages.builds index c9b666d6..978c2ac5 100644 --- a/src/pkg/packages.builds +++ b/src/pkg/packages.builds @@ -9,7 +9,9 @@ - + + + $(AdditionalProperties) From 4aa510f16419ad89a3a5d058019a2c595463af28 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 11 Jul 2017 21:10:33 -0700 Subject: [PATCH 130/198] Update CoreClr, CoreFx to preview3-25512-01, preview3-25511-03, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index fea6f222..c428e212 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 - c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + c3cfdf2ab9ff16f7cd0bde0823ec3658aa923f49 + c3cfdf2ab9ff16f7cd0bde0823ec3658aa923f49 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25511-01 - 2.0.0-preview3-25511-01 - 2.0.0-preview3-25510-01 + 4.4.0-preview3-25511-03 + 2.0.0-preview3-25511-03 + 2.0.0-preview3-25512-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From d332e07d5bf7134f6163a4d18c20057800acbf45 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 12 Jul 2017 18:30:55 -0700 Subject: [PATCH 131/198] Update CoreClr, CoreFx to preview3-25512-03, preview3-25513-01, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index c428e212..54d6f19e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - c3cfdf2ab9ff16f7cd0bde0823ec3658aa923f49 - c3cfdf2ab9ff16f7cd0bde0823ec3658aa923f49 + 63dd0f9b25abf54cde000f4e241acc456d4c606f + 63dd0f9b25abf54cde000f4e241acc456d4c606f c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25511-03 - 2.0.0-preview3-25511-03 - 2.0.0-preview3-25512-01 + 4.4.0-preview3-25513-01 + 2.0.0-preview3-25513-01 + 2.0.0-preview3-25512-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From f41a55388ac97603fcab26095501903782b0d90a Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 13 Jul 2017 06:42:50 -0700 Subject: [PATCH 132/198] Update CoreClr, CoreFx to preview3-25513-01, preview3-25513-02, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 54d6f19e..20a6f48a 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 63dd0f9b25abf54cde000f4e241acc456d4c606f - 63dd0f9b25abf54cde000f4e241acc456d4c606f + 27020643c4d9a6353ac44cd66118635183adbb3c + 27020643c4d9a6353ac44cd66118635183adbb3c c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25513-01 - 2.0.0-preview3-25513-01 - 2.0.0-preview3-25512-03 + 4.4.0-preview3-25513-02 + 2.0.0-preview3-25513-02 + 2.0.0-preview3-25513-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From 1b047a04057cec973cfb890fd21f7a639cfcd118 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 14 Jul 2017 09:16:25 -0700 Subject: [PATCH 133/198] Update CoreClr, CoreFx to preview3-25514-01, preview3-25514-03, respectively (#2830) --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 20a6f48a..8bc58031 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 27020643c4d9a6353ac44cd66118635183adbb3c - 27020643c4d9a6353ac44cd66118635183adbb3c + 426a6667387f0dcbc6637c30320ed4cf103bba15 + 426a6667387f0dcbc6637c30320ed4cf103bba15 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25513-02 - 2.0.0-preview3-25513-02 - 2.0.0-preview3-25513-01 + 4.4.0-preview3-25514-03 + 2.0.0-preview3-25514-03 + 2.0.0-preview3-25514-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From 59fc8986f81f18b1767b40f5d1c9b8e89f80b20b Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 17 Jul 2017 06:19:15 -0700 Subject: [PATCH 134/198] Update CoreClr, CoreFx to preview3-25517-01, preview3-25517-02, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 8bc58031..41c5b8d7 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 426a6667387f0dcbc6637c30320ed4cf103bba15 - 426a6667387f0dcbc6637c30320ed4cf103bba15 + d83dc310d0da05696691e4c964c964b3bf219510 + d83dc310d0da05696691e4c964c964b3bf219510 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25514-03 - 2.0.0-preview3-25514-03 - 2.0.0-preview3-25514-01 + 4.4.0-preview3-25517-02 + 2.0.0-preview3-25517-02 + 2.0.0-preview3-25517-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From a6b62d564dc0d337c89627ccddd9847dd51fa169 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 18 Jul 2017 06:31:57 -0700 Subject: [PATCH 135/198] Update CoreClr, CoreFx to preview3-25518-01, preview3-25518-02, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index 41c5b8d7..b24e03fc 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - d83dc310d0da05696691e4c964c964b3bf219510 - d83dc310d0da05696691e4c964c964b3bf219510 + 401c80913afdea5399e0f39376db88e465ae62c9 + 401c80913afdea5399e0f39376db88e465ae62c9 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25517-02 - 2.0.0-preview3-25517-02 - 2.0.0-preview3-25517-01 + 4.4.0-preview3-25518-02 + 2.0.0-preview3-25518-02 + 2.0.0-preview3-25518-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From e5e416e8c23a0f5c0bd515051b8e3978902a0068 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 18 Jul 2017 21:14:10 -0700 Subject: [PATCH 136/198] Update CoreClr, CoreFx to preview3-25519-01, preview3-25519-01, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index b24e03fc..c905f6da 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,16 +9,16 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 401c80913afdea5399e0f39376db88e465ae62c9 - 401c80913afdea5399e0f39376db88e465ae62c9 + cfaaf5de4349877a3e2c4f7c9df5784b8bc209a5 + cfaaf5de4349877a3e2c4f7c9df5784b8bc209a5 c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25518-02 - 2.0.0-preview3-25518-02 - 2.0.0-preview3-25518-01 + 4.4.0-preview3-25519-01 + 2.0.0-preview3-25519-01 + 2.0.0-preview3-25519-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0-preview3-25507-01 1.4.1 From 13662bd153a1e6b7af474ba37efaa3095c3a9598 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 19 Jul 2017 13:59:55 -0700 Subject: [PATCH 137/198] Update CoreClr, CoreFx, Standard to stable, preview3-25519-03, preview3-25519-03, respectively --- dependencies.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies.props b/dependencies.props index c905f6da..0527c112 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,18 +9,18 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - cfaaf5de4349877a3e2c4f7c9df5784b8bc209a5 - cfaaf5de4349877a3e2c4f7c9df5784b8bc209a5 - c3e732d2cf3f4b4d5e3b1ef53a1e4cab8fc73545 + 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 + 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 + 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a - 4.4.0-preview3-25519-01 - 2.0.0-preview3-25519-01 - 2.0.0-preview3-25519-01 + 4.4.0-preview3-25519-03 + 2.0.0 + 2.0.0 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) - 2.0.0-preview3-25507-01 + 2.0.0 1.4.1 4.4.0-preview3-25503-01 From a6236076125cda66f7dd1ff035e162a536ce3448 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 11 Jul 2017 17:07:06 -0700 Subject: [PATCH 138/198] Stabilize packages for .NET Core 2.0 release --- dependencies.props | 14 +++++-- dir.props | 42 +++++++++---------- src/pkg/packaging/dir.proj | 2 +- .../src/Microsoft.NETCore.App.depproj | 36 ++++++++-------- ...t.NETCore.UniversalWindowsPlatform.depproj | 16 +++---- src/pkg/projects/dir.targets | 14 +++++-- src/src.builds | 5 ++- 7 files changed, 73 insertions(+), 56 deletions(-) diff --git a/dependencies.props b/dependencies.props index 0527c112..b6e55630 100644 --- a/dependencies.props +++ b/dependencies.props @@ -16,8 +16,9 @@ - 4.4.0-preview3-25519-03 2.0.0 + 4.4.0-preview3-25519-03 + 4.4.0-preview3-25519-03 2.0.0 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 @@ -59,13 +60,18 @@ $(MSBuildThisFileFullPath) - CoreFxVersion + PlatformPackageVersion + Microsoft.NETCore.Platforms + + + $(MSBuildThisFileFullPath) + MicrosoftPrivateCoreFxNETCoreAppPackageVersion Microsoft.Private.CoreFx.NETCoreApp $(MSBuildThisFileFullPath) - PlatformPackageVersion - Microsoft.NETCore.Platforms + MicrosoftPrivateCoreFxUAPPackageVersion + Microsoft.Private.CoreFx.UAP $(MSBuildThisFileFullPath) diff --git a/dir.props b/dir.props index 5144c794..29091109 100644 --- a/dir.props +++ b/dir.props @@ -14,14 +14,14 @@ 2 0 0 - false - preview3 + true + servicing $(PreReleaseLabel) - Preview 3 + release/2.0.0 release/2.0.0 - + Microsoft.NETCore.App @@ -63,7 +63,7 @@ - + @@ -102,20 +102,20 @@ false $(ProductVersion) 2.0.0 - - false $(ProductVersion) 2.0.0 - false $(ProductVersion) @@ -157,7 +157,7 @@ x64 $(TargetArchitecture) - @@ -426,7 +426,7 @@ true - - - + + + \ No newline at end of file diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 534e9502..cfeea971 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -173,7 +173,7 @@ --output $(PackagesOutDir) --configuration $(ConfigurationGroup) - --version-suffix $(VersionSuffix) + --version-suffix $(VersionSuffix) unused - unused .NETCoreApp,Version=v2.0 @@ -23,7 +23,7 @@ - $(CoreFxVersion) + $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion) $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) @@ -40,7 +40,7 @@ - @@ -68,11 +68,11 @@ <_runtimePackageId>%(_runtimeCLR.NuGetPackageId) <_runtimePackageVersion>%(_runtimeCLR.NuGetPackageVersion) <_runtimePackagePath>$(PackagesDir)/$(_runtimePackageId.ToLowerInvariant())/$(_runtimePackageVersion) - + <_crossGenPath>$(_runtimePackagePath)/tools$(_crossDir)/crossgen$(ApplicationFileExtension) <_runtimeDirectory>%(_runtimeCLR.RootDir)%(_runtimeCLR.Directory) - + <_coreLibDirectory>%(_runtimeCoreLib.RootDir)%(_runtimeCoreLib.Directory) @@ -84,7 +84,7 @@ <_jitPath>%(_runtimeJIT.FullPath) <_jitPath Condition="'$(_crossDir)' != ''">$(_jitPackagePath)/runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension) - + <_fxLibDirectory>%(_fxSystemRuntime.RootDir)%(_fxSystemRuntime.Directory) @@ -100,7 +100,7 @@ - $(PackagesDir)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt @@ -135,7 +135,7 @@ - true @@ -157,7 +157,7 @@ <_docFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" /> - + ref/$(PackageTargetFramework)/%(RecursiveDir) @@ -215,7 +215,7 @@ - + <_crossGenedFilesToPackage Include="@(_filesToCrossGen->'%(CrossGenedPath)')" /> @@ -228,7 +228,7 @@ <_crossgenPlatformDirectories Include="%(_filesToCrossGen.RootDir)%(_filesToCrossGen.Directory)" /> - + @@ -261,7 +261,7 @@ - + CreatePerfMap <_crossGenSymbolsOutputDirectory>$(CrossGenSymbolsOutputPath)/%(_filesToCrossGen.TargetPath) - + <_crossGenSymbolsArgs Include="-readytorun" /> <_crossGenSymbolsArgs Include="-platform_assemblies_paths %(_filesToCrossGen.CrossGenedDirectory)$(_pathSeparatorEscaped)$(_coreLibDirectory)" /> @@ -283,9 +283,9 @@ - + - + @@ -305,7 +305,7 @@ - + @@ -320,10 +320,10 @@ - + - + diff --git a/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj b/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj index aff8aa3b..bfa67b05 100644 --- a/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj +++ b/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj @@ -4,7 +4,7 @@ unused - unused UAP,Version=v10.1 @@ -24,7 +24,7 @@ 1.6.1 - $(CoreFxVersion) + $(MicrosoftPrivateCoreFxUAPPackageVersion) $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) @@ -53,7 +53,7 @@ - @@ -71,7 +71,7 @@ <_FilesToPackage Include="@(ReferenceCopyLocalPaths)"> - true @@ -113,13 +113,13 @@ <_docFilesToPackage Include="%(FilesToPackage.RootDir)%(FilesToPackage.Directory)**\%(FilesToPackage.FileName).xml" /> - + ref/$(PackageTargetFramework)/%(RecursiveDir) - @@ -172,10 +172,10 @@ - + - + diff --git a/src/pkg/projects/dir.targets b/src/pkg/projects/dir.targets index 868e4b5e..8889edcc 100644 --- a/src/pkg/projects/dir.targets +++ b/src/pkg/projects/dir.targets @@ -6,6 +6,14 @@ true + + + $(Version) + + @@ -58,7 +66,7 @@ DestinationFolder="%(_SymbolsFiles.DestinationFolder)" /> - @@ -73,7 +81,7 @@ @@ -107,5 +115,5 @@ ItemName="Dependency" /> - + \ No newline at end of file diff --git a/src/src.builds b/src/src.builds index f1a5bd9f..093880c9 100644 --- a/src/src.builds +++ b/src/src.builds @@ -10,7 +10,10 @@ - + + + + From 1a18a9b4f82ac3c7611454f7b35c4d11a8b5660a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 20 Jul 2017 11:05:41 -0500 Subject: [PATCH 139/198] Add virtual dir ending slash --- publish/publish.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish/publish.proj b/publish/publish.proj index 2ee5bfea..db20f0da 100644 --- a/publish/publish.proj +++ b/publish/publish.proj @@ -145,7 +145,7 @@ + FilterblobNames="Runtime/$(SharedFrameworkNugetVersion)/"> From 14f167a8d14746d9fb6899136799bb3f82092676 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 20 Jul 2017 13:44:03 -0700 Subject: [PATCH 140/198] Update to readme to have 2.0.0 links --- README.md | 275 ++++++++++++++---------------------------------------- 1 file changed, 72 insertions(+), 203 deletions(-) diff --git a/README.md b/README.md index 47cea247..75bcfae9 100644 --- a/README.md +++ b/README.md @@ -30,224 +30,93 @@ They can be downloaded from [here](https://www.microsoft.com/net/download#core). Daily Builds ------------ -| Platform | Master
[![][build-badge-master]][build-master] | Release/1.1.X
[![][build-badge-1.X.X]][build-1.X.X] | Release/1.0.X
[![][build-badge-1.0.X]][build-1.0.X] | -|---------|:----------:|:----------:|:----------:| -| **Windows (x64)** | [![][win-x64-badge-master]][win-x64-version-master]
[Installer][win-x64-installer-master]
[zip][win-x64-zip-master]
[Symbols (zip)][win-x64-symbols-zip-master] | [![][win-x64-badge-1.1.X]][win-x64-version-1.1.X]
[Installer][win-x64-installer-1.1.X]
[zip][win-x64-zip-1.1.X] | [![][win-x64-badge-preview]][win-x64-version-preview]
[Installer][win-x64-installer-preview]
[zip][win-x64-zip-preview] | -| **Windows (x86)** | [![][win-x86-badge-master]][win-x86-version-master]
[Installer][win-x86-installer-master]
[zip][win-x86-zip-master]
[Symbols (zip)][win-x86-symbols-zip-master] | [![][win-x86-badge-1.1.X]][win-x86-version-1.1.X]
[Installer][win-x86-installer-1.1.X]
[zip][win-x86-zip-1.1.X] | [![][win-x86-badge-preview]][win-x86-version-preview]
[Installer][win-x86-installer-preview]
[zip][win-x86-zip-preview] | -| **Windows (arm32)** | [![][win-arm-badge-master]][win-arm-version-master]
[zip][win-arm-zip-master]
[Symbols (zip)][win-arm-symbols-zip-master] | N/A | N/A | -| **Windows (arm64)** | [![][win-arm64-badge-master]][win-arm64-version-master]
[zip][win-arm64-zip-master]
[Symbols (zip)][win-arm64-symbols-zip-master] | N/A | N/A | -| **Mac OS X (x64)** | [![][osx-badge-master]][osx-version-master]
[Installer][osx-installer-master]
[tar.gz][osx-targz-master]
[Symbols (tar.gz)][osx-symbols-targz-master] | [![][osx-badge-1.1.X]][osx-version-1.1.X]
[Installer][osx-installer-1.1.X]
[tar.gz][osx-targz-1.1.X] | [![][osx-badge-preview]][osx-version-preview]
[Installer][osx-installer-preview]
[tar.gz][osx-targz-preview] | -| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-master]][linux-x64-version-master]
[tar.gz][linux-x64-targz-master]
[Symbols (tar.gz)][linux-x64-symbols-targz-master] | N/A | N/A | -| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-master]][linux-arm-version-master]
[tar.gz][linux-arm-targz-master]
[Symbols (tar.gz)][linux-arm-symbols-targz-master] | N/A | N/A | -| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-master]][ubuntu-14.04-version-master]
[Host][ubuntu-14.04-host-master]
[Host FX Resolver][ubuntu-14.04-hostfxr-master]
[Shared Framework][ubuntu-14.04-sharedfx-master]
| [![][ubuntu-14.04-badge-1.1.X]][ubuntu-14.04-version-1.1.X]
[Host][ubuntu-14.04-host-1.1.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-14.04-sharedfx-1.1.X]
[tar.gz][ubuntu-14.04-targz-1.1.X] | [![][ubuntu-14.04-badge-preview]][ubuntu-14.04-version-preview]
[Host][ubuntu-14.04-host-preview]
[Host FX Resolver][ubuntu-14.04-hostfxr-preview]
[Shared Framework][ubuntu-14.04-sharedfx-preview]
[tar.gz][ubuntu-14.04-targz-preview] | -| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-master]][ubuntu-16.04-version-master]
[Host][ubuntu-16.04-host-master]
[Host FX Resolver][ubuntu-16.04-hostfxr-master]
[Shared Framework][ubuntu-16.04-sharedfx-master]
| [![][ubuntu-16.04-badge-1.1.X]][ubuntu-16.04-version-1.1.X]
[Host][ubuntu-16.04-host-1.1.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.04-sharedfx-1.1.X]
[tar.gz][ubuntu-16.04-targz-1.1.X] | [![][ubuntu-16.04-badge-preview]][ubuntu-16.04-version-preview]
[Host][ubuntu-16.04-host-preview]
[Host FX Resolver][ubuntu-16.04-hostfxr-preview]
[Shared Framework][ubuntu-16.04-sharedfx-preview]
[tar.gz][ubuntu-16.04-targz-preview] | -| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-master]][ubuntu-16.10-version-master]
[Host][ubuntu-16.10-host-master]
[Host FX Resolver][ubuntu-16.10-hostfxr-master]
[Shared Framework][ubuntu-16.10-sharedfx-master]
| [![][ubuntu-16.10-badge-1.1.X]][ubuntu-16.10-version-1.1.X]
[Host][ubuntu-16.10-host-1.1.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-1.1.X]
[Shared Framework][ubuntu-16.10-sharedfx-1.1.X]
[tar.gz][ubuntu-16.10-targz-1.1.X] | N/A | -| **Debian 8.2 (x64)** | [![][debian-8.2-badge-master]][debian-8.2-version-master]
[Host][debian-8.2-host-master]
[Host FX Resolver][debian-8.2-hostfxr-master]
[Shared Framework][debian-8.2-sharedfx-master]
| [![][debian-8.2-badge-1.1.X]][debian-8.2-version-1.1.X]
[Host][debian-8.2-host-1.1.X]
[Host FX Resolver][debian-8.2-hostfxr-1.1.X]
[Shared Framework][debian-8.2-sharedfx-1.1.X]
[tar.gz][debian-8.2-targz-1.1.X] | [![][debian-8.2-badge-preview]][debian-8.2-version-preview]
[Host][debian-8.2-host-preview]
[Host FX Resolver][debian-8.2-hostfxr-preview]
[Shared Framework][debian-8.2-sharedfx-preview]
[tar.gz][debian-8.2-targz-preview] | -| **CentOS 7.1 (x64)** | N/A | [![][centos-badge-1.1.X]][centos-version-1.1.X]
[tar.gz][centos-targz-1.1.X] | [![][centos-badge-preview]][centos-version-preview]
[tar.gz][centos-targz-preview] | -| **RHEL 7.2 (x64)** | [![][rhel7-badge-master]][rhel7-version-master]
[Host][rhel7-host-master]
[Host FX Resolver][rhel7-hostfxr-master]
[Shared Framework][rhel7-sharedfx-master]
| [![][rhel-badge-1.1.X]][rhel-version-1.1.X]
[tar.gz][rhel-targz-1.1.X] | [![][rhel-badge-preview]][rhel-version-preview]
[tar.gz][rhel-targz-preview] | -| **Fedora 23 (x64)** | N/A | [![][fedora-23-badge-1.1.X]][fedora-23-version-1.1.X]
[tar.gz][fedora-23-targz-1.1.X] | [![][fedora-23-badge-preview]][fedora-23-version-preview]
[tar.gz][fedora-23-targz-preview] | -| **Fedora 24 (x64)** | N/A | [![][fedora-24-badge-1.1.X]][fedora-24-version-1.1.X]
[tar.gz][fedora-24-targz-1.1.X] | N/A | -| **OpenSUSE 42.1 (x64)** | N/A | [![][opensuse-42.1-badge-1.1.X]][opensuse-42.1-version-1.1.X]
[tar.gz][opensuse-42.1-targz-1.1.X] | N/A | +| Platform | Release/2.0.X
[![][build-badge-2.0.x]][build-2.0.x] | +|---------|:----------:| +| **Windows (x64)** | [![][win-x64-badge-2.0.X]][win-x64-version-2.0.X]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] | +| **Windows (x86)** | [![][win-x86-badge-2.0.X]][win-x86-version-2.0.X]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] | +| **Windows (arm32)** | [![][win-arm-badge-2.0.X]][win-arm-version-2.0.X]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] | +| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]][win-arm64-version-2.0.X]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] | +| **Mac OS X (x64)** | [![][osx-badge-2.0.X]][osx-version-2.0.X]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] | +| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]][linux-x64-version-2.0.X]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] | +| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]][linux-arm-version-2.0.X]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] | +| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]][ubuntu-14.04-version-2.0.X]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
| +| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]][ubuntu-16.04-version-2.0.X]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
| +| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]][ubuntu-16.10-version-2.0.X]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
| +| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]][debian-8.2-version-2.0.X]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
| +| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]][rhel7-version-2.0.X]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
| *Note: Our .deb packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented above.* -[build-badge-master]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/3160/badge -[build-master]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=3160&_a=completed +[build-badge-2.0.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6161/badge +[build-2.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=6161&_a=completed -[build-badge-1.X.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/4188/badge -[build-1.X.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=4188&_a=completed +[win-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-x64_Release_version_badge.svg +[win-x64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.x64.version +[win-x64-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x64.latest.exe +[win-x64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x64.latest.zip +[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-x64.latest.zip -[build-badge-1.0.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/4187/badge -[build-1.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=4187&_a=completed +[win-x86-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-x86_Release_version_badge.svg +[win-x86-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.x86.version +[win-x86-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x86.latest.exe +[win-x86-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x86.latest.zip +[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-x86.latest.zip +[win-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-arm_Release_version_badge.svg +[win-arm-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.arm.version +[win-arm-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-arm.latest.zip +[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-arm.latest.zip -[win-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-x64_Release_version_badge.svg -[win-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.x64.version -[win-x64-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x64.latest.exe -[win-x64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x64.latest.zip -[win-x64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-x64.latest.zip +[win-arm64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-arm64_Release_version_badge.svg +[win-arm64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.arm64.version +[win-arm64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-arm64.latest.zip +[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-arm64.latest.zip -[win-x64-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg -[win-x64-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x64.version -[win-x64-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-win-x64.latest.exe -[win-x64-zip-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-win-x64.latest.zip +[osx-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_osx-x64_Release_version_badge.svg +[osx-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.osx.x64.version +[osx-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-osx-x64.latest.pkg +[osx-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-osx-x64.latest.tar.gz +[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-osx-x64.latest.tar.gz -[win-x64-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Windows_x64_Release_version_badge.svg -[win-x64-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.win.x64.version -[win-x64-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x64.latest.exe -[win-x64-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x64.latest.zip +[linux-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_linux-x64_Release_version_badge.svg +[linux-x64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.linux.x64.version +[linux-x64-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-linux-x64.latest.tar.gz +[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-linux-x64.latest.tar.gz -[win-x86-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-x86_Release_version_badge.svg -[win-x86-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.x86.version -[win-x86-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x86.latest.exe -[win-x86-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-x86.latest.zip -[win-x86-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-x86.latest.zip +[linux-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_linux-arm_Release_version_badge.svg +[linux-arm-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.linux.arm.version +[linux-arm-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-linux-arm.latest.tar.gz +[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-linux-arm.latest.tar.gz -[win-x86-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg -[win-x86-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.win.x86.version -[win-x86-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-win-x86.latest.exe -[win-x86-zip-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-win-x86.latest.zip +[ubuntu-14.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg +[ubuntu-14.04-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.x64.version +[ubuntu-14.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.14.04-x64.latest.deb +[ubuntu-14.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.14.04-x64.latest.deb +[ubuntu-14.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.14.04-x64.latest.deb -[win-x86-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Windows_x86_Release_version_badge.svg -[win-x86-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.win.x86.version -[win-x86-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-win-x86.latest.exe -[win-x86-zip-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-win-x86.latest.zip +[ubuntu-16.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg +[ubuntu-16.04-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.16.04.x64.version +[ubuntu-16.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.16.04-x64.latest.deb +[ubuntu-16.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb +[ubuntu-16.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb -[win-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-arm_Release_version_badge.svg -[win-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.arm.version -[win-arm-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-arm.latest.zip -[win-arm-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-arm.latest.zip +[ubuntu-16.10-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg +[ubuntu-16.10-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.16.10.x64.version +[ubuntu-16.10-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.16.10-x64.latest.deb +[ubuntu-16.10-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb +[ubuntu-16.10-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb -[win-arm64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_win-arm64_Release_version_badge.svg -[win-arm64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.win.arm64.version -[win-arm64-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-win-arm64.latest.zip -[win-arm64-symbols-zip-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-win-arm64.latest.zip +[debian-8.2-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_debian.8-x64_Release_version_badge.svg +[debian-8.2-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.debian.8.x64.version +[debian-8.2-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-debian.8-x64.latest.deb +[debian-8.2-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-debian.8-x64.latest.deb +[debian-8.2-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-debian.8-x64.latest.deb -[osx-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_osx-x64_Release_version_badge.svg -[osx-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.osx.x64.version -[osx-installer-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-osx-x64.latest.pkg -[osx-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-osx-x64.latest.tar.gz -[osx-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-osx-x64.latest.tar.gz - -[osx-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg -[osx-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.osx.x64.version -[osx-installer-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-osx-x64.latest.pkg -[osx-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-osx-x64.latest.tar.gz - -[osx-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_OSX_x64_Release_version_badge.svg -[osx-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.osx.x64.version -[osx-installer-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-osx-x64.latest.pkg -[osx-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-osx-x64.latest.tar.gz - - -[linux-x64-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_linux-x64_Release_version_badge.svg -[linux-x64-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.linux.x64.version -[linux-x64-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-linux-x64.latest.tar.gz -[linux-x64-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-linux-x64.latest.tar.gz - -[linux-arm-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_linux-arm_Release_version_badge.svg -[linux-arm-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.linux.arm.version -[linux-arm-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-linux-arm.latest.tar.gz -[linux-arm-symbols-targz-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-symbols-linux-arm.latest.tar.gz - -[ubuntu-14.04-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg -[ubuntu-14.04-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.x64.version -[ubuntu-14.04-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.14.04-x64.latest.deb -[ubuntu-14.04-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.14.04-x64.latest.deb -[ubuntu-14.04-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.14.04-x64.latest.deb - -[ubuntu-14.04-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_x64_Release_version_badge.svg -[ubuntu-14.04-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.x64.version -[ubuntu-14.04-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb -[ubuntu-14.04-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu-x64.latest.deb -[ubuntu-14.04-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb -[ubuntu-14.04-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz - -[ubuntu-14.04-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Ubuntu_x64_Release_version_badge.svg -[ubuntu-14.04-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.ubuntu.x64.version -[ubuntu-14.04-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu-x64.latest.deb -[ubuntu-14.04-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-ubuntu-x64.latest.deb -[ubuntu-14.04-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu-x64.latest.deb -[ubuntu-14.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu-x64.latest.tar.gz - - -[ubuntu-16.04-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg -[ubuntu-16.04-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.16.04.x64.version -[ubuntu-16.04-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb - -[ubuntu-16.04-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_16_04_x64_Release_version_badge.svg -[ubuntu-16.04-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.16.04.x64.version -[ubuntu-16.04-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz - -[ubuntu-16.04-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Ubuntu_16_04_x64_Release_version_badge.svg -[ubuntu-16.04-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.ubuntu.16.04.x64.version -[ubuntu-16.04-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-ubuntu.16.04-x64.latest.tar.gz - - -[ubuntu-16.10-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg -[ubuntu-16.10-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.ubuntu.16.10.x64.version -[ubuntu-16.10-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb - -[ubuntu-16.10-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Ubuntu_16_10_x64_Release_version_badge.svg -[ubuntu-16.10-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.ubuntu.16.10.x64.version -[ubuntu-16.10-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-ubuntu.16.10-x64.latest.tar.gz - - -[debian-8.2-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_debian.8-x64_Release_version_badge.svg -[debian-8.2-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.debian.8.x64.version -[debian-8.2-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-debian.8-x64.latest.deb -[debian-8.2-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-debian.8-x64.latest.deb -[debian-8.2-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-debian.8-x64.latest.deb - -[debian-8.2-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Debian_x64_Release_version_badge.svg -[debian-8.2-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.debian.x64.version -[debian-8.2-host-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-host-debian-x64.latest.deb -[debian-8.2-hostfxr-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-hostfxr-debian-x64.latest.deb -[debian-8.2-sharedfx-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Installers/Latest/dotnet-sharedframework-debian-x64.latest.deb -[debian-8.2-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-debian-x64.latest.tar.gz - -[debian-8.2-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Debian_x64_Release_version_badge.svg -[debian-8.2-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.debian.x64.version -[debian-8.2-host-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-host-debian-x64.latest.deb -[debian-8.2-hostfxr-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-hostfxr-debian-x64.latest.deb -[debian-8.2-sharedfx-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Installers/Latest/dotnet-sharedframework-debian-x64.latest.deb -[debian-8.2-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-debian-x64.latest.tar.gz - - -[centos-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_CentOS_x64_Release_version_badge.svg -[centos-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.centos.x64.version -[centos-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-centos-x64.latest.tar.gz - -[centos-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_CentOS_x64_Release_version_badge.svg -[centos-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.centos.x64.version -[centos-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-centos-x64.latest.tar.gz - - -[rhel7-badge-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/sharedfx_rhel.7-x64_Release_version_badge.svg -[rhel7-version-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/latest.sharedfx.rhel.7.x64.version -[rhel7-host-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-host-rhel.7-x64.latest.rpm -[rhel7-hostfxr-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-hostfxr-rhel.7-x64.latest.rpm -[rhel7-sharedfx-master]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/master/dotnet-sharedframework-rhel.7-x64.latest.rpm - -[rhel-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg -[rhel-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.rhel.x64.version -[rhel-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz - -[rhel-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_RHEL_x64_Release_version_badge.svg -[rhel-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.rhel.x64.version -[rhel-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-rhel-x64.latest.tar.gz - - -[fedora-23-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Fedora_23_x64_Release_version_badge.svg -[fedora-23-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.fedora.23.x64.version -[fedora-23-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz - -[fedora-23-badge-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/sharedfx_Fedora_23_x64_Release_version_badge.svg -[fedora-23-version-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/dnvm/latest.sharedfx.fedora.23.x64.version -[fedora-23-targz-preview]: https://dotnetcli.blob.core.windows.net/dotnet/preview/Binaries/Latest/dotnet-fedora.23-x64.latest.tar.gz - - -[fedora-24-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_Fedora_24_x64_Release_version_badge.svg -[fedora-24-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.fedora.24.x64.version -[fedora-24-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-fedora.24-x64.latest.tar.gz - - -[opensuse-42.1-badge-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/sharedfx_openSUSE_42_1_x64_Release_version_badge.svg -[opensuse-42.1-version-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/dnvm/latest.sharedfx.opensuse.42.1.x64.version -[opensuse-42.1-targz-1.1.X]: https://dotnetcli.blob.core.windows.net/dotnet/release/1.1.0/Binaries/Latest/dotnet-opensuse.42.1-x64.latest.tar.gz +[rhel7-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_rhel.7-x64_Release_version_badge.svg +[rhel7-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.rhel.7.x64.version +[rhel7-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-rhel.7-x64.latest.rpm +[rhel7-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-rhel.7-x64.latest.rpm +[rhel7-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-rhel.7-x64.latest.rpm # Debian daily feed From aea7b1cab8912f78a07408d9e95aafb9bea1e150 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 20 Jul 2017 16:10:38 -0500 Subject: [PATCH 141/198] Add virtual dir ending slash when finalizing build --- tools-local/tasks/FinalizeBuild.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools-local/tasks/FinalizeBuild.cs b/tools-local/tasks/FinalizeBuild.cs index fac14b25..9bafa56e 100644 --- a/tools-local/tasks/FinalizeBuild.cs +++ b/tools-local/tasks/FinalizeBuild.cs @@ -94,7 +94,7 @@ namespace Microsoft.DotNet.Build.Tasks try { - CopyBlobs($"Runtime/{ProductVersion}", $"Runtime/{Channel}/"); + CopyBlobs($"Runtime/{ProductVersion}/", $"Runtime/{Channel}/"); // Generate the latest version text file string sfxVersion = GetSharedFrameworkVersionFileContent(); From 55f0381a63349ba53e4f4e8b5b6dd17b1826993f Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 21 Jul 2017 11:13:34 -0700 Subject: [PATCH 142/198] Update links now that we have a build to verify --- README.md | 124 ++++++++++++++++++++++++------------------------------ 1 file changed, 56 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index 75bcfae9..b105778b 100644 --- a/README.md +++ b/README.md @@ -32,91 +32,79 @@ Daily Builds | Platform | Release/2.0.X
[![][build-badge-2.0.x]][build-2.0.x] | |---------|:----------:| -| **Windows (x64)** | [![][win-x64-badge-2.0.X]][win-x64-version-2.0.X]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] | -| **Windows (x86)** | [![][win-x86-badge-2.0.X]][win-x86-version-2.0.X]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] | -| **Windows (arm32)** | [![][win-arm-badge-2.0.X]][win-arm-version-2.0.X]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] | -| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]][win-arm64-version-2.0.X]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] | -| **Mac OS X (x64)** | [![][osx-badge-2.0.X]][osx-version-2.0.X]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] | -| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]][linux-x64-version-2.0.X]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] | -| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]][linux-arm-version-2.0.X]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] | -| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]][ubuntu-14.04-version-2.0.X]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
| -| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]][ubuntu-16.04-version-2.0.X]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
| -| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]][ubuntu-16.10-version-2.0.X]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
| -| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]][debian-8.2-version-2.0.X]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
| -| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]][rhel7-version-2.0.X]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
| +| **Windows (x64)** | [![][win-x64-badge-2.0.X]]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] | +| **Windows (x86)** | [![][win-x86-badge-2.0.X]]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] | +| **Windows (arm32)** | [![][win-arm-badge-2.0.X]]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] | +| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] | +| **Mac OS X (x64)** | [![][osx-badge-2.0.X]]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] | +| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] | +| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] | +| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
| +| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
| +| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
| +| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
| +| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
| *Note: Our .deb packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented above.* [build-badge-2.0.X]: https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/6161/badge [build-2.0.X]: https://devdiv.visualstudio.com/DevDiv/_build/index?definitionId=6161&_a=completed -[win-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-x64_Release_version_badge.svg -[win-x64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.x64.version -[win-x64-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x64.latest.exe -[win-x64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x64.latest.zip -[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-x64.latest.zip +[win-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x64_Release_version_badge.svg +[win-x64-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.exe +[win-x64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.zip +[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-x64.Microsoft.NETCore.App.latest.symbols.nupkg -[win-x86-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-x86_Release_version_badge.svg -[win-x86-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.x86.version -[win-x86-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x86.latest.exe -[win-x86-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-x86.latest.zip -[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-x86.latest.zip +[win-x86-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x86_Release_version_badge.svg +[win-x86-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.exe +[win-x86-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.zip +[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-x86.Microsoft.NETCore.App.latest.symbols.nupkg -[win-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-arm_Release_version_badge.svg -[win-arm-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.arm.version -[win-arm-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-arm.latest.zip -[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-arm.latest.zip +[win-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm_Release_version_badge.svg +[win-arm-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm.zip +[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-arm.Microsoft.NETCore.App.latest.symbols.nupkg -[win-arm64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_win-arm64_Release_version_badge.svg -[win-arm64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.win.arm64.version -[win-arm64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-win-arm64.latest.zip -[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-win-arm64.latest.zip +[win-arm64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm64_Release_version_badge.svg +[win-arm64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm64.zip +[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-arm64.Microsoft.NETCore.App.latest.symbols.nupkg -[osx-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_osx-x64_Release_version_badge.svg -[osx-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.osx.x64.version -[osx-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-osx-x64.latest.pkg -[osx-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-osx-x64.latest.tar.gz -[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-osx-x64.latest.tar.gz +[osx-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_osx-x64_Release_version_badge.svg +[osx-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.pkg +[osx-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.tar.gz +[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.osx-x64.Microsoft.NETCore.App.latest.symbols.nupkg -[linux-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_linux-x64_Release_version_badge.svg -[linux-x64-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.linux.x64.version -[linux-x64-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-linux-x64.latest.tar.gz -[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-linux-x64.latest.tar.gz +[linux-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-x64_Release_version_badge.svg +[linux-x64-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-x64.tar.gz +[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.linux-x64.Microsoft.NETCore.App.latest.symbols.nupkg -[linux-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_linux-arm_Release_version_badge.svg -[linux-arm-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.linux.arm.version -[linux-arm-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-linux-arm.latest.tar.gz -[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-symbols-linux-arm.latest.tar.gz +[linux-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-arm_Release_version_badge.svg +[linux-arm-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-arm.tar.gz +[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.linux-arm.Microsoft.NETCore.App.latest.symbols.nupkg -[ubuntu-14.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg -[ubuntu-14.04-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.x64.version -[ubuntu-14.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.14.04-x64.latest.deb -[ubuntu-14.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.14.04-x64.latest.deb -[ubuntu-14.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.14.04-x64.latest.deb +[ubuntu-14.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg +[ubuntu-14.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.14.04-x64.deb +[ubuntu-14.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.14.04-x64.deb +[ubuntu-14.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.14.04-x64.deb -[ubuntu-16.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg -[ubuntu-16.04-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.16.04.x64.version -[ubuntu-16.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.16.04-x64.latest.deb -[ubuntu-16.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.16.04-x64.latest.deb +[ubuntu-16.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.16.04-x64_Release_version_badge.svg +[ubuntu-16.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.16.04-x64.deb +[ubuntu-16.04-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.16.04-x64.deb -[ubuntu-16.10-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg -[ubuntu-16.10-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.ubuntu.16.10.x64.version -[ubuntu-16.10-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-ubuntu.16.10-x64.latest.deb -[ubuntu-16.10-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-ubuntu.16.10-x64.latest.deb +[ubuntu-16.10-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.16.10-x64_Release_version_badge.svg +[ubuntu-16.10-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-ubuntu.16.10-x64.deb +[ubuntu-16.10-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-ubuntu.16.10-x64.deb -[debian-8.2-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_debian.8-x64_Release_version_badge.svg -[debian-8.2-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.debian.8.x64.version -[debian-8.2-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-debian.8-x64.latest.deb -[debian-8.2-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-debian.8-x64.latest.deb -[debian-8.2-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-debian.8-x64.latest.deb +[debian-8.2-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_debian.8-x64_Release_version_badge.svg +[debian-8.2-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-debian.8-x64.deb +[debian-8.2-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-debian.8-x64.deb +[debian-8.2-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-debian.8-x64.deb -[rhel7-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/sharedfx_rhel.7-x64_Release_version_badge.svg -[rhel7-version-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/latest.sharedfx.rhel.7.x64.version -[rhel7-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-host-rhel.7-x64.latest.rpm -[rhel7-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-hostfxr-rhel.7-x64.latest.rpm -[rhel7-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/2.0.0/dotnet-sharedframework-rhel.7-x64.latest.rpm +[rhel7-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_rhel.7-x64_Release_version_badge.svg +[rhel7-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-rhel.7-x64.rpm +[rhel7-hostfxr-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-hostfxr-latest-rhel.7-x64.rpm +[rhel7-sharedfx-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-rhel.7-x64.rpm # Debian daily feed From cf836571c3605fdb29d27e0155bdb717f8e59617 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 21 Jul 2017 11:30:10 -0700 Subject: [PATCH 143/198] Add badge links to point to the svg file We no longer have .version files so just have the badges link to there svg files --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b105778b..9d100bb5 100644 --- a/README.md +++ b/README.md @@ -32,18 +32,18 @@ Daily Builds | Platform | Release/2.0.X
[![][build-badge-2.0.x]][build-2.0.x] | |---------|:----------:| -| **Windows (x64)** | [![][win-x64-badge-2.0.X]]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] | -| **Windows (x86)** | [![][win-x86-badge-2.0.X]]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] | -| **Windows (arm32)** | [![][win-arm-badge-2.0.X]]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] | -| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] | -| **Mac OS X (x64)** | [![][osx-badge-2.0.X]]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] | -| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] | -| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] | -| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
| -| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
| -| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
| -| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
| -| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
| +| **Windows (x64)** | [![][win-x64-badge-2.0.X]][win-x64-badge-2.0.X]
[Installer][win-x64-installer-2.0.X]
[zip][win-x64-zip-2.0.X]
[Symbols (zip)][win-x64-symbols-zip-2.0.X] | +| **Windows (x86)** | [![][win-x86-badge-2.0.X]][win-x86-badge-2.0.X]
[Installer][win-x86-installer-2.0.X]
[zip][win-x86-zip-2.0.X]
[Symbols (zip)][win-x86-symbols-zip-2.0.X] | +| **Windows (arm32)** | [![][win-arm-badge-2.0.X]][win-arm-badge-2.0.X]
[zip][win-arm-zip-2.0.X]
[Symbols (zip)][win-arm-symbols-zip-2.0.X] | +| **Windows (arm64)** | [![][win-arm64-badge-2.0.X]][win-arm64-badge-2.0.X]
[zip][win-arm64-zip-2.0.X]
[Symbols (zip)][win-arm64-symbols-zip-2.0.X] | +| **Mac OS X (x64)** | [![][osx-badge-2.0.X]][osx-badge-2.0.X]
[Installer][osx-installer-2.0.X]
[tar.gz][osx-targz-2.0.X]
[Symbols (tar.gz)][osx-symbols-targz-2.0.X] | +| **Linux (x64)** (for glibc based OS) | [![][linux-x64-badge-2.0.X]][linux-x64-badge-2.0.X]
[tar.gz][linux-x64-targz-2.0.X]
[Symbols (tar.gz)][linux-x64-symbols-targz-2.0.X] | +| **Linux (armhf)** (for glibc based OS) | [![][linux-arm-badge-2.0.X]][linux-arm-badge-2.0.X]
[tar.gz][linux-arm-targz-2.0.X]
[Symbols (tar.gz)][linux-arm-symbols-targz-2.0.X] | +| **Ubuntu 14.04 (x64)** | [![][ubuntu-14.04-badge-2.0.X]][ubuntu-14.04-badge-2.0.X]
[Host][ubuntu-14.04-host-2.0.X]
[Host FX Resolver][ubuntu-14.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-14.04-sharedfx-2.0.X]
| +| **Ubuntu 16.04 (x64)** | [![][ubuntu-16.04-badge-2.0.X]][ubuntu-16.04-badge-2.0.X]
[Host][ubuntu-16.04-host-2.0.X]
[Host FX Resolver][ubuntu-16.04-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.04-sharedfx-2.0.X]
| +| **Ubuntu 16.10 (x64)** | [![][ubuntu-16.10-badge-2.0.X]][ubuntu-16.10-badge-2.0.X]
[Host][ubuntu-16.10-host-2.0.X]
[Host FX Resolver][ubuntu-16.10-hostfxr-2.0.X]
[Shared Framework][ubuntu-16.10-sharedfx-2.0.X]
| +| **Debian 8.2 (x64)** | [![][debian-8.2-badge-2.0.X]][debian-8.2-badge-2.0.X]
[Host][debian-8.2-host-2.0.X]
[Host FX Resolver][debian-8.2-hostfxr-2.0.X]
[Shared Framework][debian-8.2-sharedfx-2.0.X]
| +| **RHEL 7.2 (x64)** | [![][rhel7-badge-2.0.X]][rhel7-badge-2.0.X]
[Host][rhel7-host-2.0.X]
[Host FX Resolver][rhel7-hostfxr-2.0.X]
[Shared Framework][rhel7-sharedfx-2.0.X]
| *Note: Our .deb packages are put together slightly differently than the other OS specific installers. Instead of combining everything, we have separate component packages that depend on each other. If you're installing these directly from the .deb files (via dpkg or similar), then you'll need to install them in the order presented above.* From 27a9466aed44fff0d696815479fb0bba894152af Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Fri, 21 Jul 2017 16:57:57 -0700 Subject: [PATCH 144/198] Make sure to use stable package when restoring This fixes the invalid package dependency to the prerelease package version instead of the stable package version --- dir.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.props b/dir.props index 29091109..b05459a2 100644 --- a/dir.props +++ b/dir.props @@ -140,7 +140,7 @@ - /p:VersionSuffix=$(VersionSuffix) + /p:VersionSuffix=$(VersionSuffix) From d85d263924c2ee7b7109d4ee209275ad1dbcb2b4 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 24 Jul 2017 12:57:14 -0700 Subject: [PATCH 145/198] Set VersionSuffix to empty for stable builds --- dir.props | 3 ++- src/pkg/packaging/dir.proj | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dir.props b/dir.props index b05459a2..79aa9cc4 100644 --- a/dir.props +++ b/dir.props @@ -73,6 +73,7 @@ $(PreReleaseLabel)- $(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor) + -$(VersionSuffix) $(MajorVersion).$(MinorVersion).$(PatchVersion)$(ProductVersionSuffix) $(MajorVersion).$(MinorVersion).$(PatchVersion) @@ -140,7 +141,7 @@ - /p:VersionSuffix=$(VersionSuffix) + /p:VersionSuffix=$(VersionSuffix) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index cfeea971..00da3388 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -2,7 +2,7 @@ - + GenerateVersionBadge; @@ -26,7 +26,7 @@ - - + Command='find %(OutDirs.Identity) -type f -name "*" -exec chmod 644 {} \;' /> + + Command='find %(OutDirs.Identity) -type f -name "*.so" -exec chmod 755 {} \;' /> - - + Command='find %(OutDirs.Identity) -type f ! -name "*.*" -exec chmod 755 {} \;' /> + + - + - + - + @@ -129,10 +129,10 @@ - - - + @@ -173,11 +173,11 @@ --output $(PackagesOutDir) --configuration $(ConfigurationGroup) - --version-suffix $(VersionSuffix) + --version-suffix $(VersionSuffix) - + From 8715beff9aa15b06b5868b7258769222ccad1f79 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Mon, 24 Jul 2017 13:55:49 -0700 Subject: [PATCH 146/198] Update Symbol links to point at the zip files --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9d100bb5..fa76ada3 100644 --- a/README.md +++ b/README.md @@ -53,33 +53,33 @@ Daily Builds [win-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x64_Release_version_badge.svg [win-x64-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.exe [win-x64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x64.zip -[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-x64.Microsoft.NETCore.App.latest.symbols.nupkg +[win-x64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-x64.zip [win-x86-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-x86_Release_version_badge.svg [win-x86-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.exe [win-x86-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-x86.zip -[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-x86.Microsoft.NETCore.App.latest.symbols.nupkg +[win-x86-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-x86.zip [win-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm_Release_version_badge.svg [win-arm-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm.zip -[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-arm.Microsoft.NETCore.App.latest.symbols.nupkg +[win-arm-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-arm.zip [win-arm64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_win-arm64_Release_version_badge.svg [win-arm64-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-win-arm64.zip -[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.win-arm64.Microsoft.NETCore.App.latest.symbols.nupkg +[win-arm64-symbols-zip-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-win-arm64.zip [osx-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_osx-x64_Release_version_badge.svg [osx-installer-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.pkg [osx-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-osx-x64.tar.gz -[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.osx-x64.Microsoft.NETCore.App.latest.symbols.nupkg +[osx-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-osx-x64.tar.gz [linux-x64-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-x64_Release_version_badge.svg [linux-x64-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-x64.tar.gz -[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.linux-x64.Microsoft.NETCore.App.latest.symbols.nupkg +[linux-x64-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-linux-x64.tar.gz [linux-arm-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_linux-arm_Release_version_badge.svg [linux-arm-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-latest-linux-arm.tar.gz -[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/runtime.linux-arm.Microsoft.NETCore.App.latest.symbols.nupkg +[linux-arm-symbols-targz-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-runtime-symbols-latest-linux-arm.tar.gz [ubuntu-14.04-badge-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/sharedfx_ubuntu.14.04-x64_Release_version_badge.svg [ubuntu-14.04-host-2.0.X]: https://dotnetcli.blob.core.windows.net/dotnet/Runtime/release/2.0.0/dotnet-host-latest-ubuntu.14.04-x64.deb From a56e0fa1ca2e023dea6132541005977f52353f43 Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Fri, 4 Aug 2017 20:15:51 +0200 Subject: [PATCH 147/198] Port to release/2.0.0 - Enable RHEL6 and CentOS 6 RID detection in build This change adds RHEL6 and CentOS 6 RID detection to src/corehost/build.sh. These distros don't have the /etc/os-release file and so we need to use another source - the /etc/redhat-release file. It is an exact copy of the same change merged in for CoreCLR. --- src/corehost/build.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/corehost/build.sh b/src/corehost/build.sh index da6c3d01..5b368d29 100755 --- a/src/corehost/build.sh +++ b/src/corehost/build.sh @@ -14,35 +14,38 @@ init_rid_plat() else if [ -e $ROOTFS_DIR/etc/os-release ]; then source $ROOTFS_DIR/etc/os-release - export __rid_plat="$ID.$VERSION_ID" + __rid_plat="$ID.$VERSION_ID" fi echo "__rid_plat is $__rid_plat" fi else + __rid_plat="" if [ -e /etc/os-release ]; then source /etc/os-release - if [[ "$ID" == "rhel" && $VERSION_ID = 7* ]]; then - export __rid_plat="rhel.7" + __rid_plat="rhel.7" elif [[ "$ID" == "centos" && "$VERSION_ID" = "7" ]]; then - export __rid_plat="rhel.7" + __rid_plat="rhel.7" else - export __rid_plat="$ID.$VERSION_ID" + __rid_plat="$ID.$VERSION_ID" + fi + elif [ -e /etc/redhat-release ]; then + local redhatRelease=$( Date: Mon, 7 Aug 2017 12:08:09 -0700 Subject: [PATCH 148/198] Incrememnt package version to 2.0.1 --- dir.props | 4 ++-- src/pkg/packaging/dir.proj | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dir.props b/dir.props index 79aa9cc4..88946389 100644 --- a/dir.props +++ b/dir.props @@ -13,8 +13,8 @@ 2 0 - 0 - true + 1 + false servicing $(PreReleaseLabel) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 00da3388..5c59033f 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -164,8 +164,12 @@ + + false + + - + From 4086c685b15acda0091921ffa22b8dee503ae6c9 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 7 Aug 2017 18:41:52 -0700 Subject: [PATCH 149/198] Update CoreClr, CoreFx to servicing-25608-01, servicing-25608-01, respectively --- dependencies.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.props b/dependencies.props index b6e55630..dfe80012 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 - 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 + 766d73a9d334865d22eb8938ca605a427ce1271c + 766d73a9d334865d22eb8938ca605a427ce1271c 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a 2.0.0 - 4.4.0-preview3-25519-03 - 4.4.0-preview3-25519-03 - 2.0.0 + 4.4.1-servicing-25608-01 + 4.4.0-preview3-25526-01 + 2.0.1-servicing-25608-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From 11cbcc497579a1f186ec6ae68f7b0ff43a05320a Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 9 Aug 2017 23:01:40 -0500 Subject: [PATCH 150/198] [release/2.0.0] Only publish when destination deliberately specified (#2993) * Only publish for deliberate destinations * Make ChecksumContainerName pipebuild-configurable * Make ContainerName pipebuild-configurable --- buildpipeline/Core-Setup-Linux-Arm-BT.json | 8 ++++++- buildpipeline/Core-Setup-Linux-BT.json | 10 ++++++-- buildpipeline/Core-Setup-OSX-BT.json | 8 ++++++- buildpipeline/Core-Setup-Publish.json | 8 ++++++- buildpipeline/Core-Setup-Windows-Arm-BT.json | 8 ++++++- buildpipeline/Core-Setup-Windows-BT.json | 8 ++++++- publish/publish.proj | 25 +++++++++++++------- 7 files changed, 59 insertions(+), 16 deletions(-) diff --git a/buildpipeline/Core-Setup-Linux-Arm-BT.json b/buildpipeline/Core-Setup-Linux-Arm-BT.json index 6457d98a..0c75dfe9 100644 --- a/buildpipeline/Core-Setup-Linux-Arm-BT.json +++ b/buildpipeline/Core-Setup-Linux-Arm-BT.json @@ -141,7 +141,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", + "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -357,6 +357,9 @@ "PB_AzureAccountName": { "value": "sourcebuild" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true @@ -382,6 +385,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true diff --git a/buildpipeline/Core-Setup-Linux-BT.json b/buildpipeline/Core-Setup-Linux-BT.json index a6af5ac6..35dc987f 100644 --- a/buildpipeline/Core-Setup-Linux-BT.json +++ b/buildpipeline/Core-Setup-Linux-BT.json @@ -141,7 +141,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", + "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -760,6 +760,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true @@ -834,6 +837,9 @@ "PB_AzureAccountName": { "value": "sourcebuild" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true @@ -863,7 +869,7 @@ "value": "/flp:v=diag /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=false /p:ConfigurationGroup=$(BuildConfiguration) /p:OSGroup=Linux /p:OfficialBuildId=$(OfficialBuildId)" }, "DistroSpecificMSBuildPublishArgs": { - "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)" + "value": "/p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) $(PB_DebianKeys)" }, "PB_DebianKeys": { "value": "/p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)" diff --git a/buildpipeline/Core-Setup-OSX-BT.json b/buildpipeline/Core-Setup-OSX-BT.json index 7872962e..e3273cbb 100644 --- a/buildpipeline/Core-Setup-OSX-BT.json +++ b/buildpipeline/Core-Setup-OSX-BT.json @@ -85,7 +85,7 @@ }, "inputs": { "filename": "$(PB_SourcesDirectory)/Tools/msbuild.sh", - "arguments": "$(PB_SourcesDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=OSX", + "arguments": "$(PB_SourcesDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=OSX", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -193,6 +193,9 @@ "PB_AzureAccountName": { "value": "sourcebuild" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true @@ -200,6 +203,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true diff --git a/buildpipeline/Core-Setup-Publish.json b/buildpipeline/Core-Setup-Publish.json index 0727b5c3..cc68e64f 100644 --- a/buildpipeline/Core-Setup-Publish.json +++ b/buildpipeline/Core-Setup-Publish.json @@ -117,7 +117,7 @@ "solution": "$(PB_SourcesDirectory)\\publish\\publish.proj", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "/p:Configuration=$(BuildConfiguration) $(PB_CommonMSBuildArgs) /p:NuGetFeedUrl=$(NUGET_FEED_URL) /p:NuGetSymbolsFeedUrl=$(NUGET_SYMBOLS_FEED_URL) /p:NuGetApiKey=$(NUGET_API_KEY) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:GitHubUser=$(PB_GitHubUser) /p:GitHubEmail=$(PB_GitHubEmail) /p:GitHubAuthToken=$(GITHUB_PASSWORD) /p:VersionsRepoOwner=$(PB_VersionsRepoOwner) /p:VersionsRepo=$(PB_VersionsRepo) /p:VersionsRepoPath=build-info/dotnet/$(PB_RepoName)/$(SourceBranch) /p:Finalize=true /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -263,6 +263,9 @@ "PB_AzureAccountName": { "value": "dotnetcli" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true @@ -270,6 +273,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true diff --git a/buildpipeline/Core-Setup-Windows-Arm-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json index c6d0e975..754e0cae 100644 --- a/buildpipeline/Core-Setup-Windows-Arm-BT.json +++ b/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -237,7 +237,7 @@ "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken)", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -414,6 +414,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true @@ -424,6 +427,9 @@ "PB_AzureAccountName": { "value": "sourcebuild" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json index 28b5d443..b7845723 100644 --- a/buildpipeline/Core-Setup-Windows-BT.json +++ b/buildpipeline/Core-Setup-Windows-BT.json @@ -426,7 +426,7 @@ "msbuildLocation": "", "platform": "$(PB_TargetArchitecture)", "configuration": "$(BuildConfiguration)", - "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", + "msbuildArguments": "$(PB_CommonMSBuildArgs) /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:PublishRidAgnosticPackages=$(PB_PublishRidAgnosticPackages) /p:BuildFullPlatformManifest=$(PB_BuildFullPlatformManifest) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\publish.log", "clean": "false", "maximumCpuCount": "false", "restoreNugetPackages": "false", @@ -615,6 +615,9 @@ "PB_AzureAccountName": { "value": "sourcebuild" }, + "PB_ContainerName": { + "value": "dotnet" + }, "PB_AzureAccessToken": { "value": null, "isSecret": true @@ -622,6 +625,9 @@ "PB_ChecksumAzureAccountName": { "value": "dotnetclichecksums" }, + "PB_ChecksumContainerName": { + "value": "dotnet" + }, "PB_ChecksumAzureAccessToken": { "value": null, "isSecret": true diff --git a/publish/publish.proj b/publish/publish.proj index db20f0da..f40d76fd 100644 --- a/publish/publish.proj +++ b/publish/publish.proj @@ -11,9 +11,13 @@ - - + DependsOnTargets="PublishCoreHostPackagesToFeed;FinalizeBuildInAzure;UpdateVersionsRepo" /> + + + + @@ -85,8 +89,13 @@ - + DependsOnTargets="GenerateDebRepoFiles" + Condition="'$(DebRepoId)' != '' AND + '$(DebRepoUser)' != '' AND + '$(DebRepoPass)' != '' AND + '$(DebRepoServer)' != ''"> + - + Condition="'@(_MissingBlobNames)' == '' AND '$(NuGetFeedUrl)' != ''"> @@ -185,8 +193,7 @@ - + Condition="'$(PublishDebToolToFeed)' == 'true' AND '$(CliNuGetFeedUrl)' != ''"> From f41b2697b3c3b741ba06c7af9ae65d0d920522a0 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 10 Aug 2017 16:33:48 -0700 Subject: [PATCH 151/198] Update init-tools.sh to detect rhel6 --- init-tools.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/init-tools.sh b/init-tools.sh index ddb8b75e..40632416 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -33,6 +33,14 @@ OSName=$(uname -s) Linux) __DOTNET_PKG=dotnet-dev-linux-x64 OS=Linux + + if [ -e /etc/redhat-release ]; then + redhatRelease=$( Date: Mon, 14 Aug 2017 17:28:18 +0200 Subject: [PATCH 152/198] Add RHEL 6 official RID --- src/pkg/projects/netcoreappRIDs.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pkg/projects/netcoreappRIDs.props b/src/pkg/projects/netcoreappRIDs.props index 1f7736bd..efc59265 100644 --- a/src/pkg/projects/netcoreappRIDs.props +++ b/src/pkg/projects/netcoreappRIDs.props @@ -17,6 +17,7 @@ + x86 From 9b58ba8ade7c4241e67bbc0db5594e8eacf51475 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 14 Aug 2017 19:11:45 -0700 Subject: [PATCH 153/198] Update CoreClr, CoreFx to servicing-25614-03, servicing-25615-02, respectively --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index dfe80012..ac05b9b6 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 766d73a9d334865d22eb8938ca605a427ce1271c - 766d73a9d334865d22eb8938ca605a427ce1271c + 72362537a25ef969751f8d59bee92700f40a1ea6 + 72362537a25ef969751f8d59bee92700f40a1ea6 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a 2.0.0 - 4.4.1-servicing-25608-01 + 4.4.1-servicing-25615-02 4.4.0-preview3-25526-01 - 2.0.1-servicing-25608-01 + 2.0.1-servicing-25614-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From 02401efa94ff3f41225bca87489d783d2b7d323a Mon Sep 17 00:00:00 2001 From: smile21prc Date: Tue, 15 Aug 2017 09:03:07 -0700 Subject: [PATCH 154/198] Add Redhat6 to official build of core-setup (#3017) * Add Redhat6 to official build of core-setup Add Redhat6 to official build of core-setup. As it's not a portable build, it's parameter is different from rhel.7.2-x64. * Chang the Rid name. Chang the Rid name as we don't have a RID for 6.9. * Update Centos 6 dockertag Update Centos 6 dockertag --- buildpipeline/pipeline.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 99a5b6d1..4a171a5a 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -30,6 +30,21 @@ "Platform": "x64" } }, + { + "Name": "Core-Setup-Linux-BT", + "Parameters": { + "PB_DistroRid": "rhel.6-x64", + "PB_DockerTag": "centos-6-c8c9b08-20174310104313", + "PB_AdditionalBuildArguments":"-PortableBuild=false -strip-symbols", + "PB_PortableBuild": "false" + }, + "ReportingParameters": { + "SubType": "LabBuild", + "OperatingSystem": "RedHat6", + "Type": "build/product/", + "Platform": "x64" + } + }, { "Name": "Core-Setup-Linux-Arm-BT", "Parameters": { From e1af2dbd18a24a9c569818f58d96d5bbe0cddb2c Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 15 Aug 2017 09:23:46 -0700 Subject: [PATCH 155/198] Update official build parameters for RHEL6 Moved to using Core-setup-Linux-ARM-BT definition The ARM in the name is missleading and is only the default which can be overrridden. We are using that definition because the normal linux definition builds a bunch more stuff like other distro packages which we don't need for RH6. --- buildpipeline/pipeline.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index 4a171a5a..f1ff01e6 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -31,37 +31,37 @@ } }, { - "Name": "Core-Setup-Linux-BT", + "Name": "Core-Setup-Linux-Arm-BT", "Parameters": { "PB_DistroRid": "rhel.6-x64", "PB_DockerTag": "centos-6-c8c9b08-20174310104313", - "PB_AdditionalBuildArguments":"-PortableBuild=false -strip-symbols", + "PB_TargetArchitecture": "x64", + "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -DistroRid=rhel.6-x64 -PortableBuild=false -strip-symbols", "PB_PortableBuild": "false" }, "ReportingParameters": { - "SubType": "LabBuild", "OperatingSystem": "RedHat6", "Type": "build/product/", "Platform": "x64" } - }, + }, { - "Name": "Core-Setup-Linux-Arm-BT", - "Parameters": { - "PB_DistroRid": "ubuntu.14.04-arm", - "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239", - "PB_TargetArchitecture": "arm", + "Name": "Core-Setup-Linux-Arm-BT", + "Parameters": { + "PB_DistroRid": "ubuntu.14.04-arm", + "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239", + "PB_TargetArchitecture": "arm", "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols", "PB_CrossBuildArgs": "-e ROOTFS_DIR ", - "PB_PortableBuild": "true" - }, - "ReportingParameters": { - "SubType": "PortableBuild", - "OperatingSystem": "Ubuntu 14.04", - "Type": "build/product/", - "Platform": "arm" - } - }, + "PB_PortableBuild": "true" + }, + "ReportingParameters": { + "SubType": "PortableBuild", + "OperatingSystem": "Ubuntu 14.04", + "Type": "build/product/", + "Platform": "arm" + } + }, { "Name": "Core-Setup-OSX-BT", "Parameters": { From 21c16c6890e22aac28cb1c1df5cb4164738d0380 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 15 Aug 2017 10:38:18 -0700 Subject: [PATCH 156/198] Update BuildTools version This updates the BuildTools version to match what is in corefx this eliminate some of the issues by eliminating native assets from Buildtools output that aren't needed. --- BuildToolsVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index e079aa20..fb62cb8e 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01616-04 +2.0.0-prerelease-01903-01 \ No newline at end of file From b7d080edbbd302811d10f52b594eecd00d79c060 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 15 Aug 2017 10:59:25 -0700 Subject: [PATCH 157/198] Add _.pdb placeholder file as part of the BuildTools update. --- src/pkg/projects/_.pdb | 0 src/pkg/projects/dir.targets | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/pkg/projects/_.pdb diff --git a/src/pkg/projects/_.pdb b/src/pkg/projects/_.pdb new file mode 100644 index 00000000..e69de29b diff --git a/src/pkg/projects/dir.targets b/src/pkg/projects/dir.targets index 8889edcc..8261c68b 100644 --- a/src/pkg/projects/dir.targets +++ b/src/pkg/projects/dir.targets @@ -43,7 +43,7 @@ - runtimes/$(PackageTargetRuntime)/native true From 8fd5323f0879e3ae2259cde15c2449cbd84b6470 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Wed, 26 Jul 2017 09:52:03 -0700 Subject: [PATCH 158/198] Enable building this repo with VS2017 --- run.cmd | 19 +++++++++------ run.ps1 | 3 ++- src/corehost/build.cmd | 55 +++++++++++++++++++++++++++--------------- 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/run.cmd b/run.cmd index 2f52e07d..b513914a 100644 --- a/run.cmd +++ b/run.cmd @@ -1,16 +1,21 @@ @if "%_echo%" neq "on" echo off setlocal -if not defined VisualStudioVersion ( - if defined VS140COMNTOOLS ( - call "%VS140COMNTOOLS%\VsDevCmd.bat" - goto :Run - ) - echo Error: Visual Studio 2015 required. - echo Please see https://github.com/dotnet/core-setup/blob/master/Documentation/building/windows-instructions.md for build instructions. +if defined VisualStudioVersion goto :Run + +set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" +if exist %_VSWHERE% ( + for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools +) +if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS% +if not exist "%_VSCOMNTOOLS%" ( + echo Error: Visual Studio 2015 or 2017 required. + echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions. exit /b 1 ) +call "%_VSCOMNTOOLS%\VsDevCmd.bat" + :Run :: We do not want to run the first-time experience. set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 diff --git a/run.ps1 b/run.ps1 index c7cbb8d7..5363d4ff 100644 --- a/run.ps1 +++ b/run.ps1 @@ -8,5 +8,6 @@ $initTools = Join-Path $PSScriptRoot "init-tools.cmd" # execute the tool using the dotnet.exe host $dotNetExe = Join-Path $toolsLocalPath "dotnetcli\dotnet.exe" $runExe = Join-Path $toolsLocalPath "run.exe" -& $dotNetExe $runExe $args +$runConfig = Join-Path $PSScriptRoot "config.json" +& $dotNetExe $runExe $runConfig $args exit $LastExitCode \ No newline at end of file diff --git a/src/corehost/build.cmd b/src/corehost/build.cmd index 4ef41bec..2aa4f757 100644 --- a/src/corehost/build.cmd +++ b/src/corehost/build.cmd @@ -41,33 +41,50 @@ shift goto :Arg_Loop :ToolsVersion -:: Determine the tools version to pass to cmake/msbuild -if not defined VisualStudioVersion ( - if defined VS140COMNTOOLS ( - goto :VS2015 - ) - goto :MissingVersion -) -if "%VisualStudioVersion%"=="14.0" ( + +if defined VisualStudioVersion goto :RunVCVars + +set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" +if exist %_VSWHERE% ( + for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools +) +if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS% +if not exist "%_VSCOMNTOOLS%" goto :MissingVersion + +call "%_VSCOMNTOOLS%\VsDevCmd.bat" + +:RunVCVars +if "%VisualStudioVersion%"=="15.0" ( + goto :VS2017 +) else if "%VisualStudioVersion%"=="14.0" ( goto :VS2015 -) +) :MissingVersion -:: Can't find VS 2013+ -echo Error: Visual Studio 2015 required -echo Please see https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md for build instructions. +:: Can't find VS 2015 or 2017 +echo Error: Visual Studio 2015 or 2017 required +echo Please see https://github.com/dotnet/corefx/tree/master/Documentation for build instructions. exit /b 1 -:VS2015 -:: Setup vars for VS2015 -set __VSVersion=vs2015 -set __PlatformToolset=v140 -if NOT "%__BuildArch%" == "arm64" ( +:VS2017 +:: Setup vars for VS2017 +set __VSVersion=vs2017 +set __PlatformToolset=v141 +if NOT "%__BuildArch%" == "arm64" ( :: Set the environment for the native build - call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %__VCBuildArch% + call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" %__VCBuildArch% ) goto :SetupDirs +:VS2015 +:: Setup vars for VS2015build +set __VSVersion=vs2015 +set __PlatformToolset=v140 +if NOT "%__BuildArch%" == "arm64" ( + :: Set the environment for the native build + call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %__VCBuildArch% +) + :SetupDirs :: Setup to cmake the native components echo Commencing build of corehost @@ -102,7 +119,7 @@ exit /b 1 :GenVSSolution :: Regenerate the VS solution -if /i "%__BuildArch%" == "arm64" ( +if /i "%__BuildArch%" == "arm64" ( REM arm64 builds currently use private toolset which has not been released yet REM TODO, remove once the toolset is open. call :PrivateToolSet From 15e34cd2c57ae5daa83c412d987dd342886d799a Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 15 Aug 2017 11:50:50 -0700 Subject: [PATCH 159/198] Add nuget.runtimemodel to the custom build task dependency list nuget.runtimemodel isn't comming with the build tools restore anymore so making it local. --- build.proj | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.proj b/build.proj index 47378ea9..0cadd7b6 100644 --- a/build.proj +++ b/build.proj @@ -6,7 +6,7 @@ true - + true @@ -42,13 +42,16 @@ netstandard1.3 net451 + netstandard1.3 + net45 - + - + + From 715604ad09b5fda1445436977e7032e6d29aa8f5 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 15 Aug 2017 15:08:49 -0700 Subject: [PATCH 160/198] Pass MNAVersion to the dotnet store command for the tests --- src/test/TestUtils/TestProjectFixture.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/TestUtils/TestProjectFixture.cs b/src/test/TestUtils/TestProjectFixture.cs index ed4b94f5..09acb478 100644 --- a/src/test/TestUtils/TestProjectFixture.cs +++ b/src/test/TestUtils/TestProjectFixture.cs @@ -289,6 +289,8 @@ namespace Microsoft.DotNet.CoreSetup.Test storeArgs.Add("--working-dir"); storeArgs.Add("store_workin_dir"); + storeArgs.Add($"/p:MNAVersion={_repoDirectoriesProvider.MicrosoftNETCoreAppVersion}"); + dotnet.Store(storeArgs.ToArray()) .WorkingDirectory(_testProject.ProjectDirectory) .Environment("NUGET_PACKAGES", _repoDirectoriesProvider.NugetPackages) From 9f63630d2e9d3b94498bbfa004b613f1d8cf05d3 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Wed, 16 Aug 2017 10:36:26 -0700 Subject: [PATCH 161/198] Update CoreFx to servicing-25616-01 --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index ac05b9b6..20a2706a 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,7 +9,7 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 72362537a25ef969751f8d59bee92700f40a1ea6 + a38adfe07ad2aaeee8c4b82d30ee977d94815fff 72362537a25ef969751f8d59bee92700f40a1ea6 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a @@ -17,7 +17,7 @@ 2.0.0 - 4.4.1-servicing-25615-02 + 4.4.1-servicing-25616-01 4.4.0-preview3-25526-01 2.0.1-servicing-25614-03 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) From 424916882fb8d49f49fc330a73d8906a83445f77 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 22 Aug 2017 10:41:32 -0700 Subject: [PATCH 162/198] Update CoreClr, CoreFx to servicing-25622-01, servicing-25622-02, respectively --- dependencies.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.props b/dependencies.props index 20a2706a..ef937a92 100644 --- a/dependencies.props +++ b/dependencies.props @@ -17,9 +17,9 @@ 2.0.0 - 4.4.1-servicing-25616-01 + 4.4.1-servicing-25622-02 4.4.0-preview3-25526-01 - 2.0.1-servicing-25614-03 + 2.0.1-servicing-25622-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From 173c2118f13aedc17d0340688f7a8f9cd8be4dff Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 29 Aug 2017 20:49:43 -0700 Subject: [PATCH 163/198] Update CoreClr, CoreFx to servicing-25630-02, servicing-25629-01, respectively --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index ef937a92..d6045d90 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - a38adfe07ad2aaeee8c4b82d30ee977d94815fff - 72362537a25ef969751f8d59bee92700f40a1ea6 + 4aba3f8079d84d8a8682a920d0ba25107813353d + 4aba3f8079d84d8a8682a920d0ba25107813353d 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a 2.0.0 - 4.4.1-servicing-25622-02 + 4.4.1-servicing-25629-01 4.4.0-preview3-25526-01 - 2.0.1-servicing-25622-01 + 2.0.1-servicing-25630-02 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From e50b093cf34ba8a519c4a7387dbc97320fdbbe96 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 30 Aug 2017 14:13:07 -0500 Subject: [PATCH 164/198] Create package items before versions update Change to use DependsOnTargets to order. The BeforeTargets pointed at the wrong target, causing the package items to be created after they were needed. --- publish/publish.proj | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/publish/publish.proj b/publish/publish.proj index f40d76fd..90674957 100644 --- a/publish/publish.proj +++ b/publish/publish.proj @@ -13,11 +13,17 @@ Condition="'$(Finalize)' == 'true'" DependsOnTargets="PublishCoreHostPackagesToFeed;FinalizeBuildInAzure;UpdateVersionsRepo" /> + + DependsOnTargets="ExcludeSymbolsPackagesFromPublishedVersions; + UpdatePublishedVersions" /> - + From e6c0c0689ec41153a3adfa0566d54ecb0ce7f81b Mon Sep 17 00:00:00 2001 From: Steve Harter Date: Tue, 5 Sep 2017 16:53:19 -0500 Subject: [PATCH 165/198] =?UTF-8?q?Allow=20AppBaseCompilation=20assembly?= =?UTF-8?q?=20resolver=20to=20resolve=20'reference'=20(#3=E2=80=A6=20(#313?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Allow AppBaseCompilation assembly resolver to resolve 'reference' (#3065) * Package DependencyModel for 2.0.1 servicing. --- src/managed/CommonManaged.props | 2 +- ...icrosoft.Extensions.DependencyModel.csproj | 4 +- .../AppBaseCompilationAssemblyResolver.cs | 8 ++-- src/pkg/packaging/dir.proj | 6 ++- .../AppBaseResolverTests.cs | 38 +++++++++++++++++++ .../TestLibraryFactory.cs | 1 + 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index b15a7f12..f1e54e58 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -5,7 +5,7 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/ - 2.0.0 + 2.0.1 $(VersionPrefix) true true diff --git a/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj b/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj index c05bac39..d09c26bd 100644 --- a/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj +++ b/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj @@ -8,7 +8,9 @@ - + + + diff --git a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs index 4500b422..7cbafacb 100644 --- a/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs +++ b/src/managed/Microsoft.Extensions.DependencyModel/Resolution/AppBaseCompilationAssemblyResolver.cs @@ -45,9 +45,11 @@ namespace Microsoft.Extensions.DependencyModel.Resolution string.Equals(library.Type, "msbuildproject", StringComparison.OrdinalIgnoreCase); var isPackage = string.Equals(library.Type, "package", StringComparison.OrdinalIgnoreCase); + var isReferenceAssembly = string.Equals(library.Type, "referenceassembly", StringComparison.OrdinalIgnoreCase); if (!isProject && !isPackage && - !string.Equals(library.Type, "referenceassembly", StringComparison.OrdinalIgnoreCase)) + !isReferenceAssembly && + !string.Equals(library.Type, "reference", StringComparison.OrdinalIgnoreCase)) { return false; } @@ -55,8 +57,8 @@ namespace Microsoft.Extensions.DependencyModel.Resolution var refsPath = Path.Combine(_basePath, RefsDirectoryName); var isPublished = _fileSystem.Directory.Exists(refsPath); - // Resolving reference assebmlies requires refs folder to exist - if (!isProject && !isPackage && !isPublished) + // Resolving reference assemblies requires refs folder to exist + if (isReferenceAssembly && !isPublished) { return false; } diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 5c59033f..712259a1 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -169,9 +169,13 @@ + + + + + - diff --git a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs index 0d3b8aa5..4f3b99ef 100644 --- a/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs +++ b/src/test/Microsoft.Extensions.DependencyModel.Tests/AppBaseResolverTests.cs @@ -89,6 +89,23 @@ namespace Microsoft.Extensions.DependencyModel.Tests Assert.True(result); } + [Fact] + public void ResolvesReferenceType() + { + var fileSystem = FileSystemMockBuilder + .Create() + .AddFiles(BasePathRefs, TestLibraryFactory.DefaultAssembly) + .Build(); + var resolver = CreateResolver(fileSystem); + var library = TestLibraryFactory.Create( + TestLibraryFactory.ReferenceType, + assemblies: TestLibraryFactory.EmptyAssemblies); + + var result = resolver.TryResolveAssemblyPaths(library, null); + + Assert.True(result); + } + [Fact] public void RequiresExistingRefsFolderForNonProjects() { @@ -129,6 +146,27 @@ namespace Microsoft.Extensions.DependencyModel.Tests assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.SecondAssembly)); } + [Fact] + public void ResolvesDirectReferenceWithoutRefsFolder() + { + var fileSystem = FileSystemMockBuilder + .Create() + .AddFiles(BasePath, TestLibraryFactory.DefaultAssembly, TestLibraryFactory.SecondAssembly) + .Build(); + var library = TestLibraryFactory.Create( + TestLibraryFactory.ReferenceType, + assemblies: TestLibraryFactory.TwoAssemblies); + var resolver = CreateResolver(fileSystem); + var assemblies = new List(); + + var result = resolver.TryResolveAssemblyPaths(library, assemblies); + + Assert.True(result); + assemblies.Should().HaveCount(2); + assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.DefaultAssembly)); + assemblies.Should().Contain(Path.Combine(BasePath, TestLibraryFactory.SecondAssembly)); + } + [Fact] public void RequiresAllLibrariesToExist() { diff --git a/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs b/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs index a1488583..e5e4e21b 100644 --- a/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs +++ b/src/test/Microsoft.Extensions.DependencyModel.Tests/TestLibraryFactory.cs @@ -30,6 +30,7 @@ namespace Microsoft.Extensions.DependencyModel.Tests public static readonly string ProjectType = "project"; public static readonly string MsBuildProjectType = "msbuildproject"; public static readonly string ReferenceAssemblyType = "referenceassembly"; + public static readonly string ReferenceType = "reference"; public static readonly string PackageType = "package"; public static CompilationLibrary Create( From 21d319f33aacefa5c75d5fdebe7737d0c139a5ec Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 5 Sep 2017 18:30:35 -0700 Subject: [PATCH 166/198] Update CoreClr, CoreFx to stable, servicing-25706-01, respectively --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index d6045d90..62559af4 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - 4aba3f8079d84d8a8682a920d0ba25107813353d - 4aba3f8079d84d8a8682a920d0ba25107813353d + b364e19b8d4d96fde5eca602837bfe1bab75e471 + b364e19b8d4d96fde5eca602837bfe1bab75e471 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a 2.0.0 - 4.4.1-servicing-25629-01 + 4.4.1-servicing-25706-01 4.4.0-preview3-25526-01 - 2.0.1-servicing-25630-02 + 2.0.1 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From 8fdda81f78dd4f744893d26c8c0c35edbfcbdf58 Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Thu, 24 Aug 2017 12:11:58 -0700 Subject: [PATCH 167/198] Mark packages as stable for 2.0.1 release --- dir.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.props b/dir.props index 88946389..1af5d5f5 100644 --- a/dir.props +++ b/dir.props @@ -14,7 +14,7 @@ 2 0 1 - false + true servicing $(PreReleaseLabel) From 5eb2f9bd659ad2161a8e035ac4bccd8f892caa0a Mon Sep 17 00:00:00 2001 From: Wes Haggard Date: Tue, 5 Sep 2017 21:10:53 -0700 Subject: [PATCH 168/198] Fix stable version issue with deb packaging --- src/pkg/packaging/deb/package.targets | 36 +++++++++++++++------------ 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/pkg/packaging/deb/package.targets b/src/pkg/packaging/deb/package.targets index 7e8b8586..44410c71 100644 --- a/src/pkg/packaging/deb/package.targets +++ b/src/pkg/packaging/deb/package.targets @@ -12,8 +12,12 @@ + + --version-suffix $(VersionSuffix) + + - + - + @@ -85,7 +89,7 @@ - + @@ -153,7 +157,7 @@ - + @@ -191,7 +195,7 @@ OverwriteReadOnlyFiles="True" SkipUnchangedFiles="False" UseHardlinksIfPossible="False" /> - + @@ -215,12 +219,12 @@ - - - - - + + + + + @@ -232,10 +236,10 @@ - + - + @@ -254,9 +258,9 @@ $(SharedFrameworkBrandName) - - $(LibIcuPackageName) - + + $(LibIcuPackageName) + From 84c95a9bed7fc5c2d3c2c97625df70743b328fff Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Date: Fri, 8 Sep 2017 10:31:21 -0700 Subject: [PATCH 169/198] Move to non-stable packages and upgrade to 2.0.2 --- dir.props | 4 ++-- src/pkg/packaging/dir.proj | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dir.props b/dir.props index 1af5d5f5..d299d439 100644 --- a/dir.props +++ b/dir.props @@ -13,8 +13,8 @@ 2 0 - 1 - true + 2 + false servicing $(PreReleaseLabel) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 712259a1..83ea832e 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -169,13 +169,10 @@ - - - - + From 3a4ca6a93c867f1369dc68337a9333fff23195f8 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Fri, 8 Sep 2017 14:08:58 -0700 Subject: [PATCH 170/198] Update CoreClr, CoreFx to servicing-25708-01, servicing-25708-01, respectively (#3160) --- dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.props b/dependencies.props index 62559af4..e6a53223 100644 --- a/dependencies.props +++ b/dependencies.props @@ -9,17 +9,17 @@ These ref versions are pulled from https://github.com/dotnet/versions. --> - b364e19b8d4d96fde5eca602837bfe1bab75e471 - b364e19b8d4d96fde5eca602837bfe1bab75e471 + 29a6592b687e8284ebba360327f48e9e6af5d0cd + 29a6592b687e8284ebba360327f48e9e6af5d0cd 99e7157bcbef063e89b0fe6a0f40ad509d8d8722 c1ea043aefee0ebcc56c298358953eaf26ff985a 2.0.0 - 4.4.1-servicing-25706-01 + 4.4.2-servicing-25708-01 4.4.0-preview3-25526-01 - 2.0.1 + 2.0.2-servicing-25708-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) 2.0.0 1.4.1 From 0b2b4208e8ae4cbf73b0e07161096cc3a7cb8fbd Mon Sep 17 00:00:00 2001 From: Karthik Rajasekaran Date: Mon, 11 Sep 2017 15:46:30 -0700 Subject: [PATCH 171/198] Update Buildtools to 2.0.0-servicing-02011-01 (#3183) --- BuildToolsVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index fb62cb8e..60afaac9 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-prerelease-01903-01 \ No newline at end of file +2.0.0-servicing-02011-01 \ No newline at end of file From e159a29e8a4e4a5502395c0ce104f12a90023e34 Mon Sep 17 00:00:00 2001 From: Jan Vorlicek Date: Tue, 12 Sep 2017 17:43:26 +0200 Subject: [PATCH 172/198] Port: Add RHEL 6 and CentOS 6 distro detection This change adds RHEL 6 and CentOS 6 distro detection. These distros don't have the /etc/os-release file and so we use an alternative source of the truth that is the /etc/redhat-release file. --- src/corehost/common/pal.unix.cpp | 30 +++++++++++++++++++ .../Native/PlatformApis.cs | 30 ++++++++++++++++--- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/corehost/common/pal.unix.cpp b/src/corehost/common/pal.unix.cpp index 1d4ed27c..9aeccf6d 100644 --- a/src/corehost/common/pal.unix.cpp +++ b/src/corehost/common/pal.unix.cpp @@ -274,6 +274,7 @@ pal::string_t pal::get_current_os_rid_platform() { pal::string_t ridOS; pal::string_t versionFile(_X("/etc/os-release")); + pal::string_t rhelVersionFile(_X("/etc/redhat-release")); if (pal::file_exists(versionFile)) { @@ -353,6 +354,35 @@ pal::string_t pal::get_current_os_rid_platform() } } } + else if (pal::file_exists(rhelVersionFile)) + { + // Read the file to check if the current OS is RHEL or CentOS 6.x + std::fstream fsVersionFile; + + fsVersionFile.open(rhelVersionFile, std::fstream::in); + + // Proceed only if we were able to open the file + if (fsVersionFile.good()) + { + pal::string_t line; + // Read the first line + std::getline(fsVersionFile, line); + + if (!fsVersionFile.eof()) + { + pal::string_t rhel6Prefix(_X("Red Hat Enterprise Linux Server release 6.")); + pal::string_t centos6Prefix(_X("CentOS release 6.")); + + if ((line.find(rhel6Prefix) == 0) || (line.find(centos6Prefix) == 0)) + { + ridOS = _X("rhel.6"); + } + } + + // Close the file now that we are done with it. + fsVersionFile.close(); + } + } return normalize_linux_rid(ridOS); } diff --git a/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs b/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs index ab16ce36..936b0b4f 100644 --- a/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs +++ b/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs @@ -85,6 +85,8 @@ namespace Microsoft.DotNet.PlatformAbstractions.Native private static DistroInfo LoadDistroInfo() { + DistroInfo result = null; + // Sample os-release file: // NAME="Ubuntu" // VERSION = "14.04.3 LTS, Trusty Tahr" @@ -100,7 +102,7 @@ namespace Microsoft.DotNet.PlatformAbstractions.Native if (File.Exists("/etc/os-release")) { var lines = File.ReadAllLines("/etc/os-release"); - var result = new DistroInfo(); + result = new DistroInfo(); foreach (var line in lines) { if (line.StartsWith("ID=", StringComparison.Ordinal)) @@ -112,10 +114,30 @@ namespace Microsoft.DotNet.PlatformAbstractions.Native result.VersionId = line.Substring(11).Trim('"', '\''); } } - - return NormalizeDistroInfo(result); } - return null; + else if (File.Exists("/etc/redhat-release")) + { + var lines = File.ReadAllLines("/etc/redhat-release"); + + if (lines.Length >= 1) + { + string line = lines[0]; + if (line.StartsWith("Red Hat Enterprise Linux Server release 6.") || + line.StartsWith("CentOS release 6.")) + { + result = new DistroInfo(); + result.Id = "rhel"; + result.VersionId = "6"; + } + } + } + + if (result != null) + { + result = NormalizeDistroInfo(result); + } + + return result; } // For some distros, we don't want to use the full version from VERSION_ID. One example is From 69f6efc7395c83721eab65fd30184a1bfb253ad3 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 12 Sep 2017 12:57:51 -0500 Subject: [PATCH 173/198] Update PlatformAbstractions and DependencyModel for 2.0.2 servicing. --- src/managed/CommonManaged.props | 2 +- .../Microsoft.Extensions.DependencyModel.csproj | 4 +--- src/pkg/packaging/dir.proj | 7 ++++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index f1e54e58..0c54133e 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -5,7 +5,7 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/ - 2.0.1 + 2.0.2 $(VersionPrefix) true true diff --git a/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj b/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj index d09c26bd..c05bac39 100644 --- a/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj +++ b/src/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj @@ -8,9 +8,7 @@ - - - + diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 83ea832e..9102701c 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -170,10 +170,15 @@ - + + + + + + --output $(PackagesOutDir) From 74fe13aa427694c4eabda630f1dfdc7f348c7f86 Mon Sep 17 00:00:00 2001 From: JC Aguilera Date: Thu, 14 Sep 2017 14:08:14 -0700 Subject: [PATCH 174/198] Add error checks --- sign.proj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sign.proj b/sign.proj index f99e762e..7be36583 100644 --- a/sign.proj +++ b/sign.proj @@ -19,6 +19,7 @@ $(BaseOutputRootPath)/ $(IntermediateOutputRootPath) + @@ -49,6 +50,7 @@ $(CertificateId) + @@ -64,6 +66,7 @@ $(CertificateId) + @@ -76,6 +79,7 @@ $(CertificateId) + @@ -88,6 +92,7 @@ $(CertificateId) + From df6ab9c2a48b47181bedfb2704888b074e8a269a Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 6 Jun 2017 22:08:22 -0500 Subject: [PATCH 175/198] Fix VersionSuffix for the managed projects VersionSuffix is getting set before $(BuildNumberMajor) and $(BuildNumberMinor) are being set. When creating the DependencyModel nupkg, it is getting a bad version on its p2p reference to PlatformAbstractions. The fix is to ensure VersionSuffix is defined correctly in the projects themselves - after the obj\BuildVersion.props file is created. Workaround https://github.com/NuGet/Home/issues/4337 --- BranchInfo.props | 13 ++++++++++++ build.proj | 19 ++--------------- dir.props | 20 +++--------------- restore.proj | 10 --------- src/managed/CommonManaged.props | 36 +++++++++++++++++++++++++++++++-- src/pkg/packaging/dir.proj | 3 +-- 6 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 BranchInfo.props delete mode 100644 restore.proj diff --git a/BranchInfo.props b/BranchInfo.props new file mode 100644 index 00000000..fa72178f --- /dev/null +++ b/BranchInfo.props @@ -0,0 +1,13 @@ + + + 2 + 0 + 2 + false + servicing + $(PreReleaseLabel) + + release/2.0.0 + release/2.0.0 + + diff --git a/build.proj b/build.proj index 0cadd7b6..bc22de9d 100644 --- a/build.proj +++ b/build.proj @@ -17,7 +17,6 @@ CreateOrUpdateCurrentVersionFile; CreateVersionInfoFile; BatchRestorePackages; - ValidateExactRestore; BuildCustomTasks; @@ -59,22 +58,8 @@ - - - - - - - - - - - - - + + diff --git a/dir.props b/dir.props index d299d439..9ab1de32 100644 --- a/dir.props +++ b/dir.props @@ -9,19 +9,8 @@ true - - - 2 - 0 - 2 - false - servicing - $(PreReleaseLabel) - - release/2.0.0 - release/2.0.0 - - + + Microsoft.NETCore.App @@ -139,10 +128,7 @@ - - - /p:VersionSuffix=$(VersionSuffix) - + DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 diff --git a/restore.proj b/restore.proj deleted file mode 100644 index ae55b08e..00000000 --- a/restore.proj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index 0c54133e..341b2afb 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -5,7 +5,24 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/ - 2.0.2 + + + + + + + $(RepoRoot)Bin/ + $(BinDir)obj/ + + + $([System.DateTime]::Now.ToString(yyyyMMdd)) + $(ObjDir)BuildVersion-$(TodayTimeStamp).props + + + + + + $(MajorVersion).$(MinorVersion).$(PatchVersion) $(VersionPrefix) true true @@ -17,6 +34,21 @@ $(RepoRoot)THIRD-PARTY-NOTICES.TXT + + + 9 + + + $(PreReleaseLabel)- + $(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor) + + $(RepoRoot)tools-local/setuptools/Key.snk true @@ -45,5 +77,5 @@ - + \ No newline at end of file diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 9102701c..bebdb482 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -183,10 +183,9 @@ --output $(PackagesOutDir) --configuration $(ConfigurationGroup) - --version-suffix $(VersionSuffix) - From 9555bd94c1da166338017939d584c75cdf6698b8 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Thu, 8 Jun 2017 17:00:31 -0500 Subject: [PATCH 176/198] Move common repo directories to isolated props file. Also remove the dev machine BuildNumberMinor workaround per PR feedback, as this is no longer necessary. --- RepoDirectories.props | 30 ++++++++++++++++++++++++++++++ dir.props | 33 ++------------------------------- src/managed/CommonManaged.props | 17 ++--------------- 3 files changed, 34 insertions(+), 46 deletions(-) create mode 100644 RepoDirectories.props diff --git a/RepoDirectories.props b/RepoDirectories.props new file mode 100644 index 00000000..caf00182 --- /dev/null +++ b/RepoDirectories.props @@ -0,0 +1,30 @@ + + + $(MSBuildThisFileDirectory) + + $(RepoRoot) + $(RepoRoot)src/ + + + $(RepoRoot)Bin/ + $(BinDir) + $(BinDir)obj/ + $(ObjDir) + + + $(RepoRoot)packages/ + $(RepoRoot)Tools/ + $(ToolRuntimePath)local/ + + $(ToolRuntimePath) + $(RepoRoot)Tools/ + $(ToolsDir) + $(ToolsDir)net46/ + $(BuildToolsTaskCoreDir) + $(BuildToolsTaskDesktopDir) + $(LocalToolRuntimePath) + $(LocalToolRuntimePath)net46/ + $(BuildToolsTaskDir) + $(ToolsDir)dotnetcli/ + + diff --git a/dir.props b/dir.props index 9ab1de32..54575cc2 100644 --- a/dir.props +++ b/dir.props @@ -24,42 +24,13 @@ $(OS) - - - $(MSBuildThisFileDirectory) - $(ProjectDir)src/ - - - $(ProjectDir)Bin/ - $(BinDir) - $(BinDir)obj/ - $(ObjDir) - - - $(ProjectDir)packages/ - $(ProjectDir)Tools/ - $(ToolRuntimePath)local/ - $(ToolRuntimePath) - $(ProjectDir)Tools/ - $(ToolRuntimePath) - $(ToolsDir)net46/ - $(LocalToolRuntimePath) - $(LocalToolRuntimePath)net46/ - $(BuildToolsTaskDir) - $(ToolsDir)dotnetcli/ - - + + - - 9 - $(PreReleaseLabel)- $(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor) diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index 341b2afb..6015227d 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -3,17 +3,10 @@ - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/ - - + - - $(RepoRoot)Bin/ - $(BinDir)obj/ - $([System.DateTime]::Now.ToString(yyyyMMdd)) $(ObjDir)BuildVersion-$(TodayTimeStamp).props @@ -35,12 +28,6 @@ - - 9 - - $([System.DateTime]::Now.ToString(yyyyMMdd)) - $(ObjDir)BuildVersion-$(TodayTimeStamp).props - - - - $(MajorVersion).$(MinorVersion).$(PatchVersion) $(VersionPrefix) @@ -27,9 +19,20 @@ $(RepoRoot)THIRD-PARTY-NOTICES.TXT + + + $([System.DateTime]::Now.ToString(yyyyMMdd)) + $(ObjDir)BuildVersion-$(TodayTimeStamp).props + + + + $(PreReleaseLabel)- From 14b3a1c34b5bb2deb0e85d6fba4dbffd53597b95 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 29 Aug 2017 17:05:29 -0500 Subject: [PATCH 178/198] Removing dead test code. --- ...nThatICareAboutMultilevelSharedFxLookup.cs | 400 ------------------ 1 file changed, 400 deletions(-) diff --git a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs index b9161980..97c721fe 100644 --- a/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs +++ b/src/test/HostActivationTests/GivenThatICareAboutMultilevelSharedFxLookup.cs @@ -161,125 +161,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .HaveStdErrContaining(_exeSelectedMessage); } - [Fact] - public void SharedFxLookup_Must_Roll_Forward_Before_Looking_Into_Another_Folder() - { - //https://github.com/dotnet/core-setup/issues/1553 - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - return; - } - else - { - // Currently no support for global locations on Linux; remaining test code below is preserved for now. - return; - } - - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - // Add some dummy versions - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy2"); - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0"); - - // Set desired version = 9999.0.0-dummy0 - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0-dummy0"); - - // Version: 9999.0.0-dummy0 - // Exe: 9999.0.0 - // global: 9999.0.2, 9999.0.0-dummy2 - // Expected: 9999.0.0-dummy2 from global dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .WithGlobalLocation(_globalDir) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.0-dummy2")); - - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.0-dummy1"); - - // Version: 9999.0.0-dummy0 - // Exe: 9999.0.0 - // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 - // Expected: 9999.0.0-dummy1 from global - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .WithGlobalLocation(_globalDir) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.0-dummy1")); - - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0-dummy0"); - - // Version: 9999.0.0-dummy0 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 - // Expected: 9999.0.0-dummy1 from global - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .WithGlobalLocation(_globalDir) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.0-dummy0")); - - SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); - // Version: 9999.0.0 - // Exe: 9999.0.0, 9999.0.0-dummy0 - // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 - // Expected: 9999.0.2 from global - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .WithGlobalLocation(_globalDir) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_globalSelectedMessage, "9999.0.2")); - - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.3"); - - // Version: 9999.0.0 - // Exe: 9999.0.0, 9999.0.0-dummy0, 9999.0.3 - // global: 9999.0.2, 9999.0.0-dummy1, 9999.0.0-dummy2 - // Expected: 9999.0.0-dummy1 from global - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .WithGlobalLocation(_globalDir) - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(Path.Combine(_exeSelectedMessage, "9999.0.3")); - - DeleteAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.0.0", "9999.0.0-dummy0","9999.0.3"); - DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.2", "9999.0.0-dummy1", "9999.0.0-dummy2"); - } - [Fact] public void SharedFxLookup_Must_Not_Roll_Forward_If_Framework_Version_Is_Specified_Through_Argument() { @@ -412,287 +293,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.MultilevelSharedFxLooku .HaveStdErrContaining("It was not possible to find any compatible framework version"); } - [Fact] - public void Roll_Forward_On_No_Candidate_Fx_Must_Look_Into_All_Lookup_Folders() - { - //https://github.com/dotnet/core-setup/issues/1553 - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - return; - } - else - { - // Currently no support for global locations on Linux; remaining test code below is preserved for now. - return; - } - - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - // Set desired version = 9999.0.0 - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); - - // Add a dummy version in the exe dir - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // Exe: empty - // Global: 9999.1.0 - // Expected: 9999.1.0 from global dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_globalSelectedMessage); - - // Add a dummy version in the user dir - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // Exe: 9999.1.1 - // Global: 9999.1.0 - // Expected: 9999.1.1 from exe dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_exeSelectedMessage); - - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); - DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); - } - - [Fact] - public void Roll_Forward_On_No_Candidate_Fx_May_Be_Enabled_Through_Runtimeconfig_Json_File() - { - //https://github.com/dotnet/core-setup/issues/1553 - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - return; - } - else - { - // Currently no support for global locations on Linux; remaining test code below is preserved for now. - return; - } - - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - // Set desired version = 9999.0.0 - // Enable 'roll forward on no candidate fx' through runtimeconfig - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 1); - - // Add some dummy versions - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.0"); - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.0.0"); - - // Set desired version = 9999.0.0 - // Disable 'roll forward on no candidate fx' through runtimeconfig - runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 0); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' disabled through runtimeconfig - // Exe: 9999.1.0 - // Global: 9999.0.0 - // Expected: 9999.0.0 from global dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_globalSelectedMessage); - } - - [Fact] - public void Roll_Forward_On_No_Candidate_Fx_May_Be_Enabled_Through_Argument() - { - //https://github.com/dotnet/core-setup/issues/1553 - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - return; - } - else - { - // Currently no support for global locations on Linux; remaining test code below is preserved for now. - return; - } - - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - // Set desired version = 9999.0.0 - // Disable 'roll forward on no candidate fx' through Runtimeconfig - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 0); - - // Add some dummy versions - AddAvailableSharedFxVersions(_exeSharedFxBaseDir, "9999.1.1"); - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.2"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through argument - // Exe: 9999.1.1 - // Global: 9999.1.2 - // Expected: 9999.1.2 from global - dotnet.Exec("--roll-forward-on-no-candidate-fx", "1", appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_globalSelectedMessage); - - // Set desired version = 9999.0.0 - // Enable 'roll forward on no candidate fx' through Runtimeconfig - SetRuntimeConfigJson(runtimeConfig, "9999.0.0", 1); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' disabled through argument - // Exe: 9999.1.1 - // Global: 9999.1.2 - // Expected: does not resolve FX - dotnet.Exec("--roll-forward-on-no-candidate-fx", "0", appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute(fExpectedToFail:true) - .Should() - .Fail() - .And - .HaveStdErrContaining("It was not possible to find any compatible framework version"); - - } - - [Fact] - public void Ensure_On_NonWindows_Multiple_Global_Locations_Are_Probed() - { - //This test is only applicable on non windows as it tests probing for global - //locations on path - if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows) - { - return; - } - else - { - // Currently no support for global locations on Linux; remaining test code below is preserved for now. - return; - } - - var fixture = PreviouslyBuiltAndRestoredPortableTestProjectFixture - .Copy(); - - var dotnet = fixture.BuiltDotnet; - var appDll = fixture.TestProject.AppDll; - - var secondary_globalDir = Path.Combine(_multilevelDir, "secondary_global"); - var secondary_globalSharedFxBaseDir = Path.Combine(secondary_globalDir, "shared", "Microsoft.NETCore.App"); - - var secondary_globalSelectedMessage = $"The expected {_hostPolicyDllName} directory is [{secondary_globalSharedFxBaseDir}"; - - Directory.CreateDirectory(_globalSharedFxBaseDir); - Directory.CreateDirectory(secondary_globalSharedFxBaseDir); - //Copy dotnet to global directory - File.Copy(Path.Combine(_builtDotnet, $"dotnet{Constants.ExeSuffix}"), Path.Combine(secondary_globalDir, $"dotnet{Constants.ExeSuffix}"), true); - - // Set desired version = 9999.0.0 - string runtimeConfig = Path.Combine(fixture.TestProject.OutputDirectory, "SharedFxLookupPortableApp.runtimeconfig.json"); - SetRuntimeConfigJson(runtimeConfig, "9999.0.0"); - - // Add a dummy version in the exe dir - AddAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // Exe: empty - // Secondary_Global: empty - // Global: 9999.1.0 - // Expected: 9999.1.0 from global dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(secondary_globalDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(_globalSelectedMessage); - - // Add a dummy version in the user dir - AddAvailableSharedFxVersions(secondary_globalSharedFxBaseDir, "9999.1.1"); - - // Version: 9999.0.0 - // 'Roll forward on no candidate fx' enabled through env var - // Exe: empty - // Secondary_Global: 9999.1.1 - // Global: 9999.1.0 - // Expected: 9999.1.1 from Secondary_Global dir - dotnet.Exec(appDll) - .WorkingDirectory(_currentWorkingDir) - .WithGlobalLocation(secondary_globalDir) - .WithGlobalLocation(_globalDir) - .EnvironmentVariable("DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX", "1") - .EnvironmentVariable("COREHOST_TRACE", "1") - .CaptureStdOut() - .CaptureStdErr() - .Execute() - .Should() - .Pass() - .And - .HaveStdErrContaining(secondary_globalSelectedMessage); - - // Remove dummy folders from user dir - DeleteAvailableSharedFxVersions(secondary_globalSharedFxBaseDir, "9999.1.1"); - DeleteAvailableSharedFxVersions(_globalSharedFxBaseDir, "9999.1.0"); - } - - // This method adds a list of new framework version folders in the specified // sharedFxBaseDir. The files are copied from the _buildSharedFxDir. // Remarks: From 5bcfb4b8b91b7e731ad07e4d1bc6aefca3862c91 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 29 Aug 2017 17:36:51 -0500 Subject: [PATCH 179/198] Clean up core-setup build. Set DisableImplicitNuGetFallbackFolder=false to ensure we never use the NuGet fallback folder that comes with the SDK. Enable SDK-based projects to import the root dir.props file. This spawned a few one-off changes since things like the BaseIntermediateOutputPath is now under RepoRoot\Bin and TreatWarningsAsErrors=true. --- Directory.Build.props | 28 +++++++++++++++++++ dir.props | 25 +++++++++++++---- src/managed/CommonManaged.props | 15 ---------- src/pkg/deps/deps.csproj | 1 - .../lockedhost/lockedhost.csproj | 1 + src/sharedFramework/sharedFramework.proj | 2 +- .../TestProjects/LightupClient/Program.cs | 1 + src/test/Assets/global.json | 3 -- src/test/TestUtils/RepoDirectoriesProvider.cs | 24 +++++++++++++++- src/test/TestUtils/TestProjectFixture.cs | 17 +++++------ 10 files changed, 81 insertions(+), 36 deletions(-) create mode 100644 Directory.Build.props delete mode 100644 src/test/Assets/global.json diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 00000000..3fb4df48 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,28 @@ + + + + + true + + + + true + true + + + + + + + $(IntermediateOutputPath) + + + \ No newline at end of file diff --git a/dir.props b/dir.props index 54575cc2..8159342e 100644 --- a/dir.props +++ b/dir.props @@ -2,6 +2,11 @@ + + + false + + @@ -260,7 +265,7 @@ - + true true false @@ -372,7 +377,7 @@ $(SharedFxDebPkgName.ToLower()) - + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)documentation @@ -384,7 +389,17 @@ true - - - + + + true + + + + + + \ No newline at end of file diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index 6b6633fc..8f91cdc5 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -1,10 +1,6 @@ - - - - $(MajorVersion).$(MinorVersion).$(PatchVersion) @@ -19,17 +15,6 @@ $(RepoRoot)THIRD-PARTY-NOTICES.TXT - - - $([System.DateTime]::Now.ToString(yyyyMMdd)) - $(ObjDir)BuildVersion-$(TodayTimeStamp).props - - - - + /p:OSGroup=$(OSGroup) /p:Architecture=$(Architecture) /p:DistroRid=$(DistroRid) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) + diff --git a/src/sharedFramework/sharedFramework.proj b/src/sharedFramework/sharedFramework.proj index 8a7d0f9a..629659de 100644 --- a/src/sharedFramework/sharedFramework.proj +++ b/src/sharedFramework/sharedFramework.proj @@ -16,6 +16,10 @@ + + $(MSBuildPassThroughPropertyList) /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) + + $(MSBuildThisFileDirectory)framework - /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion) + $(CommonProjectArgs) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion) @@ -133,7 +137,7 @@ $(MSBuildThisFileDirectory)lockedhost - /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) /p:HostResolverVersion=$(HostResolverVersion) /p:HostVersion=$(HostVersion) + $(CommonProjectArgs) /p:HostResolverVersion=$(HostResolverVersion) /p:HostVersion=$(HostVersion) diff --git a/src/test/dir.proj b/src/test/dir.proj index c8f6c353..9c77a0fb 100644 --- a/src/test/dir.proj +++ b/src/test/dir.proj @@ -47,7 +47,7 @@ @(RestoreTestSource->'--source %(Identity)', ' ') $(RestoreSourceArg) @(RestoreTestFallbackSource->'--source %(Identity)', ' ') --disable-parallel --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(RestoreSourceArg) - $(RestoreArgs) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid) + $(RestoreArgs) $(MSBuildPassThroughPropertyList) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid) DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -59,7 +59,7 @@ DependsOnTargets="DetermineTestOutputDirectory"> - --configuration $(ConfigurationGroup) + $(MSBuildPassThroughPropertyList) @@ -84,7 +84,7 @@ $([System.String]::Copy('$(SystemPathTestsOutputDir)').Replace('\', '$(DirectorySeparatorChar)')) - --configuration $(ConfigurationGroup) + $(MSBuildPassThroughPropertyList) true $(TestsOutputDir)$(TestProjectFilename)-testResults.trx From 78341778f74b65c707e5d7f0acd8b54f68e4ff07 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 30 Aug 2017 14:20:32 -0500 Subject: [PATCH 181/198] Fix the tests by passing Configuration into the tests. Fix the build on non-Windows by passing the right MSBuild properties down. Respond to PR feedback. --- dir.props | 21 ++++++++----------- src/managed/dir.proj | 5 +---- src/pkg/packaging/dir.proj | 7 +++---- src/test/TestUtils/RepoDirectoriesProvider.cs | 13 ++++++------ src/test/dir.proj | 2 +- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/dir.props b/dir.props index 3fbc055b..3f863db8 100644 --- a/dir.props +++ b/dir.props @@ -264,14 +264,6 @@ - - - true - true - false - false - - 4 @@ -378,6 +370,12 @@ + + true + true + false + false + <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)documentation @@ -390,10 +388,9 @@ - true diff --git a/src/managed/dir.proj b/src/managed/dir.proj index c3804a56..94110a5a 100644 --- a/src/managed/dir.proj +++ b/src/managed/dir.proj @@ -13,10 +13,7 @@ - /p:Configuration=$(ConfigurationGroup) - $(BuildArgs) /p:LatestCommit=$(LatestCommit) - $(BuildArgs) /p:BuiltByString="$(BuiltByString)" - $(BuildArgs) /p:BaseOutputPath=$(IntermediateOutputForPackaging) + $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index bebdb482..9269a8aa 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -181,12 +181,11 @@ - --output $(PackagesOutDir) - --configuration $(ConfigurationGroup) + --no-build --output $(PackagesOutDir) + $(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) - + diff --git a/src/test/TestUtils/RepoDirectoriesProvider.cs b/src/test/TestUtils/RepoDirectoriesProvider.cs index df771c8a..1ad4c564 100644 --- a/src/test/TestUtils/RepoDirectoriesProvider.cs +++ b/src/test/TestUtils/RepoDirectoriesProvider.cs @@ -52,6 +52,9 @@ namespace Microsoft.DotNet.CoreSetup.Test _buildArchitecture = Environment.GetEnvironmentVariable("BUILD_ARCHITECTURE"); _mnaVersion = Environment.GetEnvironmentVariable("MNA_VERSION"); + string configuration = Environment.GetEnvironmentVariable("BUILD_CONFIGURATION"); + string osPlatformConfig = $"{_buildRID}.{configuration}"; + _dotnetSDK = dotnetSdk ?? Environment.GetEnvironmentVariable("DOTNET_SDK_PATH"); if (!Directory.Exists(_dotnetSDK)) @@ -59,17 +62,13 @@ namespace Microsoft.DotNet.CoreSetup.Test throw new InvalidOperationException("ERROR: Test SDK folder not found."); } - _artifacts = Path.Combine(baseArtifactsFolder, _buildRID+".Debug"); - if(!Directory.Exists(_artifacts)) - _artifacts = Path.Combine(baseArtifactsFolder, _buildRID+".Release"); + _artifacts = Path.Combine(baseArtifactsFolder, osPlatformConfig); _hostArtifacts = artifacts ?? Path.Combine(_artifacts, "corehost"); _nugetPackages = nugetPackages ?? Path.Combine(_repoRoot, "packages"); _corehostPackages = corehostPackages ?? Path.Combine(_artifacts, "corehost"); - _builtDotnet = builtDotnet ?? Path.Combine(baseArtifactsFolder, "obj", _buildRID+".Debug", "sharedFrameworkPublish"); - if(!Directory.Exists(_builtDotnet)) - _builtDotnet = builtDotnet ?? Path.Combine(baseArtifactsFolder, "obj", _buildRID+".Release", "sharedFrameworkPublish"); + _builtDotnet = builtDotnet ?? Path.Combine(baseArtifactsFolder, "obj", osPlatformConfig, "sharedFrameworkPublish"); } private static string GetRepoRootDirectory() @@ -78,7 +77,7 @@ namespace Microsoft.DotNet.CoreSetup.Test while (currentDirectory != null) { - var gitDirOrFile = Path.Combine(currentDirectory, ".git"); + string gitDirOrFile = Path.Combine(currentDirectory, ".git"); if (Directory.Exists(gitDirOrFile) || File.Exists(gitDirOrFile)) { break; diff --git a/src/test/dir.proj b/src/test/dir.proj index 9c77a0fb..7f7d9ace 100644 --- a/src/test/dir.proj +++ b/src/test/dir.proj @@ -90,7 +90,7 @@ Date: Wed, 30 Aug 2017 15:12:26 -0500 Subject: [PATCH 182/198] Pass PortableBuild property through to all MSBuild instances. --- dir.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.props b/dir.props index 3f863db8..cba89e0f 100644 --- a/dir.props +++ b/dir.props @@ -399,7 +399,7 @@ - /p:OSGroup=$(OSGroup) /p:Architecture=$(Architecture) /p:DistroRid=$(DistroRid) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) + /p:OSGroup=$(OSGroup) /p:Architecture=$(Architecture) /p:DistroRid=$(DistroRid) /p:PortableBuild=$(PortableBuild) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) From edf50f8c2af8d1f2804668286e9e88d83e5c682d Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 30 Aug 2017 17:10:24 -0500 Subject: [PATCH 183/198] Default Platform=AnyCPU for managed projects. Also clean up the "Architecture" MSBuild property, which isn't used. --- Directory.Build.props | 4 +++- config.json | 8 -------- dir.props | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3fb4df48..38216d61 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,8 +8,10 @@ --> true - + + + AnyCPU true true diff --git a/config.json b/config.json index a77c8f1e..821b39cd 100644 --- a/config.json +++ b/config.json @@ -18,12 +18,6 @@ "values": ["x86", "arm", "x64", "amd64"], "defaultValue": "x64" }, - "Architecture":{ - "description": "Build on the specified architecture (x64 or x86 (supported only on Windows), default: x64)", - "valueType": "property", - "values": ["x64", "x86"], - "defaultValue": "x64" - }, "PortableBuild": { "description": "Indicates if this is a portable build.", "valueType": "property", @@ -267,7 +261,6 @@ "defaultValues":{ "toolName": "msbuild", "settings": { - "Architecture": "default", "TargetArchitecture": "default", "OSGroup": "default", "MsBuildLogging":"default", @@ -294,7 +287,6 @@ "defaultValues":{ "toolName": "msbuild", "settings": { - "Architecture": "default", "TargetArchitecture": "default", "Framework": "default", "OSGroup": "default", diff --git a/dir.props b/dir.props index cba89e0f..6001f91b 100644 --- a/dir.props +++ b/dir.props @@ -399,7 +399,7 @@ - /p:OSGroup=$(OSGroup) /p:Architecture=$(Architecture) /p:DistroRid=$(DistroRid) /p:PortableBuild=$(PortableBuild) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) + /p:OSGroup=$(OSGroup) /p:DistroRid=$(DistroRid) /p:PortableBuild=$(PortableBuild) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) From 742af6fcbd3e6a6199392dcc0dbe95cf72c6de1e Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 25 Sep 2017 16:10:58 -0500 Subject: [PATCH 184/198] Fixing up changes from master. --- Directory.Build.props | 2 +- RepoDirectories.props | 6 ++---- src/managed/CommonManaged.props | 9 --------- src/pkg/packaging/dir.proj | 3 ++- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 38216d61..c33640f3 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,7 +6,7 @@ We are currently on too old of an SDK to detect - it doesn't have https://github.com/dotnet/sdk/pull/1242. But once we move to a new version, we can remove this property setting, and everything else will work correctly. --> - true + true diff --git a/RepoDirectories.props b/RepoDirectories.props index caf00182..64a73ecc 100644 --- a/RepoDirectories.props +++ b/RepoDirectories.props @@ -18,10 +18,8 @@ $(ToolRuntimePath) $(RepoRoot)Tools/ - $(ToolsDir) - $(ToolsDir)net46/ - $(BuildToolsTaskCoreDir) - $(BuildToolsTaskDesktopDir) + $(ToolRuntimePath) + $(ToolsDir)net46/ $(LocalToolRuntimePath) $(LocalToolRuntimePath)net46/ $(BuildToolsTaskDir) diff --git a/src/managed/CommonManaged.props b/src/managed/CommonManaged.props index 8f91cdc5..2a62fe2b 100644 --- a/src/managed/CommonManaged.props +++ b/src/managed/CommonManaged.props @@ -15,15 +15,6 @@ $(RepoRoot)THIRD-PARTY-NOTICES.TXT - - - $(PreReleaseLabel)- - $(VersionSuffix)$(BuildNumberMajor)-$(BuildNumberMinor) - - $(RepoRoot)tools-local/setuptools/Key.snk true diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 9269a8aa..53eb4b0e 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -185,7 +185,8 @@ $(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) - + From 828915fb7c97e1051374bcb194b087e014113f83 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 26 Sep 2017 15:55:12 -0500 Subject: [PATCH 185/198] Update BuildTools to 2.0.0-servicing-02026-05 --- BuildToolsVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 60afaac9..ef2b4dd6 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-servicing-02011-01 \ No newline at end of file +2.0.0-servicing-02026-05 \ No newline at end of file From b9b9aaeb26ee43c03f7cf04cb25d6f863eb77eed Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 14:27:12 -0500 Subject: [PATCH 186/198] Update BuildTools and init-tools scripts. Using the latest 2.0.0 BuildTools and the latest init-tools scripts from corefx. --- BuildToolsVersion.txt | 2 +- init-tools.cmd | 21 +++-- init-tools.sh | 204 ++++++++++++++++++++---------------------- run.cmd | 2 - run.ps1 | 3 + run.sh | 5 +- 6 files changed, 120 insertions(+), 117 deletions(-) diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index ef2b4dd6..36c0f4c9 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -2.0.0-servicing-02026-05 \ No newline at end of file +2.0.0-servicing-02029-02 \ No newline at end of file diff --git a/init-tools.cmd b/init-tools.cmd index 40fca031..7f31e164 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -12,9 +12,6 @@ set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSI set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed -:: We do not want to run the first-time experience. -set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated if [%1]==[force] ( if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" @@ -29,10 +26,24 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" ( if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" +if exist "%DotNetBuildToolsDir%" ( + echo Using tools from '%DotNetBuildToolsDir%'. + mklink /j "%TOOLRUNTIME_DIR%" "%DotNetBuildToolsDir%" + + if not exist "%DOTNET_CMD%" ( + echo ERROR: Ensure that '%DotNetBuildToolsDir%' contains the .NET Core SDK at '%DOTNET_PATH%' + exit /b 1 + ) + + echo Done initializing tools. + echo Using tools from '%DotNetBuildToolsDir%'. > "%BUILD_TOOLS_SEMAPHORE%" + exit /b 0 +) + echo Running %0 > "%INIT_TOOLS_LOG%" set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" -if exist "%DOTNET_CMD%" goto :afterdotnetinstall +if exist "%DOTNET_CMD%" goto :afterdotnetrestore echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" @@ -46,7 +57,7 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( exit /b 1 ) -:afterdotnetinstall +:afterdotnetrestore if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... diff --git a/init-tools.sh b/init-tools.sh index 40632416..c73c1d96 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -12,119 +12,109 @@ __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 __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 +__BUILD_TOOLS_SEMAPHORE=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete -# We do not want to run the first-time experience. -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - -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 - ulimit -n 2048 - ;; - - Linux) - __DOTNET_PKG=dotnet-dev-linux-x64 - OS=Linux - - if [ -e /etc/redhat-release ]; then - redhatRelease=$( $__init_tools_log +if [ -d "$DotNetBuildToolsDir" ]; then + echo "Using tools from '$DotNetBuildToolsDir'." + ln -s "$DotNetBuildToolsDir" "$__TOOLRUNTIME_DIR" - if [ ! -e $__DOTNET_PATH ]; then - - mkdir -p "$__DOTNET_PATH" - - 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 - 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 + if [ ! -e "$__DOTNET_CMD" ]; then + echo "ERROR: Ensure that $DotNetBuildToolsDir contains the .NET Core SDK at $__DOTNET_PATH" + exit 1 fi - - 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 - - echo "Initializing BuildTools..." - echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log - - # 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 - - 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 - - Tools/crossgen.sh $__scriptpath/Tools - - mkdir -p $__INIT_TOOLS_DONE_MARKER_DIR - touch $__INIT_TOOLS_DONE_MARKER - echo "Done initializing tools." -else - echo "Tools are already initialized" + mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE + exit 0 fi + +echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log + +if [ ! -e $__DOTNET_PATH ]; then + 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 + ulimit -n 2048 + ;; + + Linux) + __DOTNET_PKG=dotnet-dev-linux-x64 + OS=Linux + + if [ -e /etc/redhat-release ]; then + redhatRelease=$(> $__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 +fi + +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 + +echo "Initializing BuildTools..." +echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log + +# 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 + +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 + +Tools/crossgen.sh $__scriptpath/Tools + +mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch $__BUILD_TOOLS_SEMAPHORE + +echo "Done initializing tools." + diff --git a/run.cmd b/run.cmd index b513914a..eb193fba 100644 --- a/run.cmd +++ b/run.cmd @@ -17,7 +17,5 @@ if not exist "%_VSCOMNTOOLS%" ( call "%_VSCOMNTOOLS%\VsDevCmd.bat" :Run -:: We do not want to run the first-time experience. -set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 powershell -NoProfile -ExecutionPolicy unrestricted -Command "%~dp0run.ps1 -- %*" exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/run.ps1 b/run.ps1 index 5363d4ff..1a260830 100644 --- a/run.ps1 +++ b/run.ps1 @@ -2,6 +2,9 @@ $toolsLocalPath = Join-Path $PSScriptRoot "Tools" $restorePackagesPath = Join-Path $PSScriptRoot "packages" +# We do not want to run the first-time experience. +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 + $initTools = Join-Path $PSScriptRoot "init-tools.cmd" & $initTools diff --git a/run.sh b/run.sh index 9b68d2d5..56e18f21 100755 --- a/run.sh +++ b/run.sh @@ -11,11 +11,12 @@ invocation='echo "Calling: ${FUNCNAME[0]}"' __scriptpath=$(cd "$(dirname "$0")"; pwd -P) __toolsLocalPath=$__scriptpath/Tools +# We do not want to run the first-time experience. +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $__scriptpath/init-tools.sh __dotnet=$__toolsLocalPath/dotnetcli/dotnet -# We do not want to run the first-time experience. -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $__dotnet $__toolsLocalPath/run.exe $* exit $? From 129ee6db61b6913403f037ee2bafa3cea57f600b Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 14:41:19 -0500 Subject: [PATCH 187/198] Respect DotNetRestorePackagesPath if it is set --- RepoDirectories.props | 1 + src/pkg/dir.targets | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RepoDirectories.props b/RepoDirectories.props index 64a73ecc..39b91558 100644 --- a/RepoDirectories.props +++ b/RepoDirectories.props @@ -12,6 +12,7 @@ $(ObjDir) + $(DotNetRestorePackagesPath) $(RepoRoot)packages/ $(RepoRoot)Tools/ $(ToolRuntimePath)local/ diff --git a/src/pkg/dir.targets b/src/pkg/dir.targets index b785ba53..85ed8815 100644 --- a/src/pkg/dir.targets +++ b/src/pkg/dir.targets @@ -2,6 +2,6 @@ - $(ProjectDir)packages\$(PlatformPackageId.ToLowerInvariant())\$(PlatformPackageVersion)\runtime.json + $(PackagesDir)$(PlatformPackageId.ToLowerInvariant())\$(PlatformPackageVersion)\runtime.json From 91d349f85d5b88727d6e7769acfa5229c57290eb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 14:57:40 -0500 Subject: [PATCH 188/198] Unify NuGet version with BuildTools version --- build.proj | 3 --- tools-local/tasks/core-setup.tasks.csproj | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/build.proj b/build.proj index 0907944f..84873261 100644 --- a/build.proj +++ b/build.proj @@ -41,15 +41,12 @@ netstandard1.3 net451 - netstandard1.3 - net45 - - 3.5.0 + 4.3.0-preview2-4095 1.1.1 From 769f784a53bfb699f5d863f9a7573b0bab83aa9a Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 15:06:10 -0500 Subject: [PATCH 189/198] Unify CLI Version with corefx release/2.0.0 branch --- DotnetCLIVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index b8320e32..170f3fc4 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -2.0.0-preview1-005899 +2.0.0-preview1-005977 From 51b1b451f069b8451a7df1a6d661f9898c09d376 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 16:09:57 -0500 Subject: [PATCH 190/198] Allow restore without internet sources --- dir.props | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dir.props b/dir.props index 6001f91b..3f76b3c5 100644 --- a/dir.props +++ b/dir.props @@ -30,6 +30,19 @@ + + + + + $(OverridePackageSource); + https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; + https://dotnet.myget.org/F/cli-deps/api/v3/index.json; + https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; + https://www.myget.org/F/nugetbuild/api/v3/index.json; + https://api.nuget.org/v3/index.json; + https://dotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json; + + @@ -88,18 +101,6 @@ 2.0.0 - - - - - - - - - - - - From 51c9c44d473921775bf7d5c79aef50fe0f031d7e Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 16:48:56 -0500 Subject: [PATCH 191/198] Update MSBuild Reference --- dependencies.props | 8 ++++++++ .../Microsoft.DotNet.Build.Tasks.Local.csproj | 16 ++++------------ tools-local/tasks/core-setup.tasks.csproj | 16 ++++------------ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dependencies.props b/dependencies.props index e6a53223..0be05e7e 100644 --- a/dependencies.props +++ b/dependencies.props @@ -33,6 +33,14 @@ $(MSBuildThisFileFullPath) + + + 15.1.1012 + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildPackageVersion) + + $(BaseDotNetBuildInfo)corefx/$(DependencyBranch) diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj index 7981e648..f7c24c46 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj @@ -50,18 +50,10 @@ - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - + + + + 4.5.24 None diff --git a/tools-local/tasks/core-setup.tasks.csproj b/tools-local/tasks/core-setup.tasks.csproj index 8e389bfa..30d27836 100644 --- a/tools-local/tasks/core-setup.tasks.csproj +++ b/tools-local/tasks/core-setup.tasks.csproj @@ -34,18 +34,10 @@ - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - - - 0.1.0-preview-00022 - + + + + 4.5.24 None From 73f497be32b0d478e02cd79aebb54949a9af5d02 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 16:59:28 -0500 Subject: [PATCH 192/198] Don't build net45 versions of tasks --- .../Microsoft.DotNet.Build.Tasks.Local.builds | 3 ++- tools-local/tasks/core-setup.tasks.builds | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds index d09375c7..41939dc5 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds @@ -5,7 +5,8 @@ TargetGroup=netstandard1.5 - + TargetGroup=net45 diff --git a/tools-local/tasks/core-setup.tasks.builds b/tools-local/tasks/core-setup.tasks.builds index d09375c7..41939dc5 100644 --- a/tools-local/tasks/core-setup.tasks.builds +++ b/tools-local/tasks/core-setup.tasks.builds @@ -5,7 +5,8 @@ TargetGroup=netstandard1.5 - + TargetGroup=net45 From f380a2a41db680480960b9a8fc91ff21f3422b05 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 17:11:51 -0500 Subject: [PATCH 193/198] Unify Versions --- dependencies.props | 2 ++ .../Microsoft.DotNet.Build.Tasks.Local.csproj | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.props b/dependencies.props index 0be05e7e..985ad13d 100644 --- a/dependencies.props +++ b/dependencies.props @@ -39,6 +39,8 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) + + 1.1.1 diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj index f7c24c46..bd03a1eb 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj @@ -25,9 +25,7 @@ - - 1.2.0-beta-001090 - + 1.3.0 From 9664a4db695d384e7f0bbf3ba26b026d524d3adf Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 29 Sep 2017 19:13:39 -0500 Subject: [PATCH 194/198] Use intermediate package cache to pick up source built packages. There are cases where we build the same version of an already shipped package, and need to ensure we use the package that was built locally. --- dir.props | 3 ++- .../lockedhost/lockedhost.csproj | 2 ++ src/sharedFramework/sharedFramework.proj | 20 ++++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dir.props b/dir.props index 3f76b3c5..b031b9c7 100644 --- a/dir.props +++ b/dir.props @@ -110,6 +110,8 @@ DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $(DotnetRestorePrefix)$(DotnetRestoreCommand) + + $(DotnetRestorePrefix)"$(DotnetToolCommand)" restore $(DotnetRestoreSource) @@ -240,7 +242,6 @@ $(IntermediateOutputRootPath)sharedFrameworkPublish\ $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ - $(SharedFrameworkPublishDir)shared\$(SharedFrameworkName)\$(SharedFrameworkNugetVersion) diff --git a/src/sharedFramework/lockedhost/lockedhost.csproj b/src/sharedFramework/lockedhost/lockedhost.csproj index 94e79734..38785134 100644 --- a/src/sharedFramework/lockedhost/lockedhost.csproj +++ b/src/sharedFramework/lockedhost/lockedhost.csproj @@ -3,6 +3,8 @@ false true + false + false 2008;8021 diff --git a/src/sharedFramework/sharedFramework.proj b/src/sharedFramework/sharedFramework.proj index 629659de..abe15ed0 100644 --- a/src/sharedFramework/sharedFramework.proj +++ b/src/sharedFramework/sharedFramework.proj @@ -18,6 +18,9 @@ $(MSBuildPassThroughPropertyList) /p:TargetFramework=$(Framework) /p:RuntimeIdentifier=$(PackageTargetRid) + + $(IntermediateOutputRootPath)sharedFrameworkPublish.packages\ + $(SharedFrameworkPublishDir)shared\$(SharedFrameworkName)\$(SharedFrameworkNugetVersion) @@ -32,13 +35,15 @@ - + + WorkingDirectory="$(SharedFrameworkSourceRoot)" /> @@ -142,13 +147,14 @@ - + - + WorkingDirectory="$(LockedHostSourceRoot)" /> \ No newline at end of file From b4e013374b9eb06b00149f285a93d309e008cafb Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 2 Oct 2017 18:14:09 -0500 Subject: [PATCH 195/198] Fix dotnet publish of sharedFramework on source-build. --- dir.props | 5 +++++ src/managed/dir.proj | 2 +- src/pkg/packaging/dir.proj | 2 +- src/sharedFramework/sharedFramework.proj | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dir.props b/dir.props index b031b9c7..456b77c0 100644 --- a/dir.props +++ b/dir.props @@ -404,6 +404,11 @@ /p:OSGroup=$(OSGroup) /p:DistroRid=$(DistroRid) /p:PortableBuild=$(PortableBuild) /p:TargetArchitecture=$(TargetArchitecture) /p:ConfigurationGroup=$(ConfigurationGroup) + + + --no-restore + + diff --git a/src/managed/dir.proj b/src/managed/dir.proj index 94110a5a..4b3bc533 100644 --- a/src/managed/dir.proj +++ b/src/managed/dir.proj @@ -13,7 +13,7 @@ - $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) + $(NoRestoreArg) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) diff --git a/src/pkg/packaging/dir.proj b/src/pkg/packaging/dir.proj index 53eb4b0e..09df4c6c 100644 --- a/src/pkg/packaging/dir.proj +++ b/src/pkg/packaging/dir.proj @@ -181,7 +181,7 @@ - --no-build --output $(PackagesOutDir) + $(NoRestoreArg) --no-build --output $(PackagesOutDir) $(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) diff --git a/src/sharedFramework/sharedFramework.proj b/src/sharedFramework/sharedFramework.proj index abe15ed0..6fcf09ac 100644 --- a/src/sharedFramework/sharedFramework.proj +++ b/src/sharedFramework/sharedFramework.proj @@ -42,7 +42,7 @@ WorkingDirectory="$(SharedFrameworkSourceRoot)" /> - @@ -153,7 +153,7 @@ - From 815ca5d26986fab7a5e19cf997ad9c50455f21c6 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 3 Oct 2017 15:54:10 -0500 Subject: [PATCH 196/198] Handle RIDs better during the build. Currently, when building non-portable on a win10 machine, core-setup restores and produces `win7` RID assets. This causes problems in source-build since corefx produces `win10` assets on the same machine. Thus, core-setup can't use the corefx assets because win10 is not compatible with win7. In fixing this, I refactored the way RIDs are handled during the build. We have 3 main RID usages: * What is the RID of the current machine? $(HostMachineRid) * What is the RID of the toolset we are using to build? core-setup doesn't have this scenario yet, but corefx calls this $(ToolRuntimeRID) * What is the RID that the current build is producing outputs for? $(OutputRid) --- RepoDirectories.props | 4 ++ build.proj | 21 +++++++ buildpipeline/Core-Setup-Linux-Arm-BT.json | 10 ++-- buildpipeline/Core-Setup-Linux-BT.json | 50 ++++++----------- buildpipeline/Core-Setup-Publish.json | 5 +- buildpipeline/Core-Setup-Windows-Arm-BT.json | 6 +- buildpipeline/Core-Setup-Windows-BT.json | 6 +- buildpipeline/pipeline.json | 12 +--- config.json | 7 --- dir.props | 58 +++++++++----------- netci.groovy | 4 +- publish/dir.props | 7 +-- publish/dir.targets | 2 +- sign.proj | 2 +- src/corehost/build.proj | 2 +- src/pkg/projects/netcoreappRIDs.props | 14 +---- src/test/dir.proj | 2 +- tools-local/scripts/arm32_ci_script.sh | 2 +- 18 files changed, 88 insertions(+), 126 deletions(-) diff --git a/RepoDirectories.props b/RepoDirectories.props index 39b91558..bb2a740a 100644 --- a/RepoDirectories.props +++ b/RepoDirectories.props @@ -26,4 +26,8 @@ $(BuildToolsTaskDir) $(ToolsDir)dotnetcli/ + + + $(BaseIntermediateOutputPath)HostMachineInfo.props + diff --git a/build.proj b/build.proj index 84873261..56f52fdd 100644 --- a/build.proj +++ b/build.proj @@ -16,6 +16,7 @@ CreateOrUpdateCurrentVersionFile; CreateVersionInfoFile; + CreateHostMachineInfoFile; BatchRestorePackages; BuildCustomTasks; @@ -34,6 +35,26 @@ + + + + + + + +<Project> + <PropertyGroup> + <HostMachineRid>$(HostMachineRid)</HostMachineRid> + </PropertyGroup> +</Project> + + + + + + diff --git a/buildpipeline/Core-Setup-Linux-Arm-BT.json b/buildpipeline/Core-Setup-Linux-Arm-BT.json index 0c75dfe9..00ffb3a1 100644 --- a/buildpipeline/Core-Setup-Linux-Arm-BT.json +++ b/buildpipeline/Core-Setup-Linux-Arm-BT.json @@ -123,7 +123,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(PB_CrossBuildArgs)$(DockerCommonRunArgs) $(PB_GitDirectory)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments)", + "arguments": "run --rm $(PB_CrossBuildArgs)$(DockerCommonRunArgs) $(PB_GitDirectory)/build.sh -OfficialBuildId=$(OfficialBuildId) $(PB_BuildArguments) -- $(PB_AdditionalMSBuildArguments)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -141,7 +141,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", + "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64) $(PB_AdditionalMSBuildArguments)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -364,15 +364,15 @@ "value": null, "isSecret": true }, - "PB_DistroRid": { - "value": "ubuntu.14.04-arm" - }, "PB_TargetArchitecture": { "value": "arm" }, "PB_AdditionalBuildArguments": { "value": "" }, + "PB_AdditionalMSBuildArguments": { + "value": "" + }, "PB_PortableBuild": { "value": "false" }, diff --git a/buildpipeline/Core-Setup-Linux-BT.json b/buildpipeline/Core-Setup-Linux-BT.json index 35dc987f..c89e75fe 100644 --- a/buildpipeline/Core-Setup-Linux-BT.json +++ b/buildpipeline/Core-Setup-Linux-BT.json @@ -141,7 +141,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:DistroRid=$(PB_DistroRid) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", + "arguments": "run --privileged --rm $(DockerCommonRunArgs) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:AzureAccountName=$(PB_AzureAccountName) /p:ContainerName=$(PB_ContainerName) /p:AzureAccessToken=$(PB_AzureAccessToken) /p:ChecksumAzureAccountName=$(PB_ChecksumAzureAccountName) /p:ChecksumContainerName=$(PB_ChecksumContainerName) /p:ChecksumAzureAccessToken=$(PB_ChecksumAzureAccessToken) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:ConfigurationGroup=$(BuildConfiguration) /p:PortableBuild=$(PB_PortableBuild) /p:OSGroup=Linux /p:DebRepoUser=$(PB_DebRepoUser) /p:DebRepoServer=$(PB_DebRepoServer) /p:DebRepoPass=$(DEB_REPO_PASSWORD) /p:DebianId_ubuntu1404-x64=$(PB_DebianId_ubuntu1404-x64) /p:DebianId_debian8-x64=$(PB_DebianId_debian8-x64) /p:DebianId_ubuntu1604-x64=$(PB_DebianId_ubuntu1604-x64) /p:DebianId_ubuntu1610-x64=$(PB_DebianId_ubuntu1610-x64)", "workingFolder": "$(PB_SourcesDirectory)", "failOnStandardError": "false" } @@ -215,7 +215,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1404) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -233,7 +233,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1404) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -251,7 +251,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1404) /p:PublishDebToolToFeed=true /p:CliNuGetFeedUrl=$(CLI_NUGET_FEED_URL) /p:CliNuGetApiKey=$(CLI_NUGET_API_KEY) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1404) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:PublishDebToolToFeed=true /p:CliNuGetFeedUrl=$(CLI_NUGET_FEED_URL) /p:CliNuGetApiKey=$(CLI_NUGET_API_KEY) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -305,7 +305,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -323,7 +323,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -341,7 +341,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1604) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1604) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -395,7 +395,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -413,7 +413,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -431,7 +431,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Ubuntu1610) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Ubuntu1610) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -485,7 +485,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -503,7 +503,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -521,7 +521,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Debian8) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Debian8) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -575,7 +575,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/build.proj /t:BuildTraversalBuildDependencies $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -593,7 +593,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments)", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/src/pkg/packaging/dir.proj $(AdditionalMSBuildProperties) $(DistroSpecificMSBuildArguments)", "workingFolder": "", "failOnStandardError": "false" } @@ -611,7 +611,7 @@ }, "inputs": { "filename": "docker", - "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj /p:DistroRid=$(DistroRid_Rhel7) $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", + "arguments": "run --rm $(DockerCommonRunArgs_Rhel7) $(PB_GitDirectory)/Tools/msbuild.sh $(PB_GitDirectory)/publish/publish.proj $(DistroSpecificMSBuildArguments) $(DistroSpecificMSBuildPublishArgs)", "workingFolder": "", "failOnStandardError": "false" } @@ -844,9 +844,6 @@ "value": null, "isSecret": true }, - "PB_DistroRid": { - "value": "ubuntu.14.04-$(PB_TargetArchitecture)" - }, "PB_TargetArchitecture": { "value": "x64" }, @@ -877,9 +874,6 @@ "DockerTag_Ubuntu1404": { "value": "ubuntu-14.04-debpkg-e5cf912-20175003025046" }, - "DistroRid_Ubuntu1404": { - "value": "ubuntu.14.04-x64" - }, "DockerImageName_Ubuntu1404": { "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1404)" }, @@ -889,9 +883,6 @@ "DockerTag_Ubuntu1604": { "value": "ubuntu-16.04-debpkg-e5cf912-20174703024721" }, - "DistroRid_Ubuntu1604": { - "value": "ubuntu.16.04-$(PB_TargetArchitecture)" - }, "DockerImageName_Ubuntu1604": { "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1604)" }, @@ -901,9 +892,6 @@ "DockerTag_Ubuntu1610": { "value": "ubuntu-16.10-debpkg-ec863bb-20170003030028" }, - "DistroRid_Ubuntu1610": { - "value": "ubuntu.16.10-$(PB_TargetArchitecture)" - }, "DockerImageName_Ubuntu1610": { "value": "$(PB_DockerRepository):$(DockerTag_Ubuntu1610)" }, @@ -913,9 +901,6 @@ "DockerTag_Debian8": { "value": "debian-8.2-debpkg-9f87c3c-20173003023006" }, - "DistroRid_Debian8": { - "value": "debian.8-$(PB_TargetArchitecture)" - }, "DockerImageName_Debian8": { "value": "$(PB_DockerRepository):$(DockerTag_Debian8)" }, @@ -925,9 +910,6 @@ "DockerTag_Rhel7": { "value": "rhel-7-rpmpkg-c982313-20174116044113" }, - "DistroRid_Rhel7": { - "value": "rhel.7-$(PB_TargetArchitecture)" - }, "DockerImageName_Rhel7": { "value": "$(PB_DockerRepository):$(DockerTag_Rhel7)" }, diff --git a/buildpipeline/Core-Setup-Publish.json b/buildpipeline/Core-Setup-Publish.json index cc68e64f..67a8a53b 100644 --- a/buildpipeline/Core-Setup-Publish.json +++ b/buildpipeline/Core-Setup-Publish.json @@ -248,9 +248,6 @@ "value": null, "isSecret": true }, - "PB_DistroRid": { - "value": "win7-x64" - }, "NUGET_SYMBOLS_FEED_URL": { "value": "https:%2F%2Fdotnet.myget.org/F/dotnet-core/symbols/api/v2/package" }, @@ -291,7 +288,7 @@ "value": "HEAD" }, "PB_CommonMSBuildArgs": { - "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture)" + "value": "/p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture)" }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" diff --git a/buildpipeline/Core-Setup-Windows-Arm-BT.json b/buildpipeline/Core-Setup-Windows-Arm-BT.json index 754e0cae..f0635203 100644 --- a/buildpipeline/Core-Setup-Windows-Arm-BT.json +++ b/buildpipeline/Core-Setup-Windows-Arm-BT.json @@ -391,10 +391,6 @@ "CertificateId": { "value": "400" }, - "PB_DistroRid": { - "value": "win-$(PB_TargetArchitecture)", - "allowOverride": true - }, "MsbuildSigningArguments": { "value": "/p:CertificateId=$(CertificateId) /v:detailed" }, @@ -451,7 +447,7 @@ "value": "real" }, "PB_CommonMSBuildArgs": { - "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)" + "value": "/p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild) /p:DisableCrossgen=true $(PB_AdditionalBuildArguments)" }, "PB_AdditionalBuildArguments": { "value": "" diff --git a/buildpipeline/Core-Setup-Windows-BT.json b/buildpipeline/Core-Setup-Windows-BT.json index b7845723..77ee222c 100644 --- a/buildpipeline/Core-Setup-Windows-BT.json +++ b/buildpipeline/Core-Setup-Windows-BT.json @@ -586,10 +586,6 @@ "CertificateId": { "value": "400" }, - "PB_DistroRid": { - "value": "win-$(PB_TargetArchitecture)", - "allowOverride": true - }, "MsbuildSigningArguments": { "value": "/p:CertificateId=$(CertificateId) /v:detailed" }, @@ -649,7 +645,7 @@ "value": "real" }, "PB_CommonMSBuildArgs": { - "value": "/p:DistroRid=$(PB_DistroRid) /p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" + "value": "/p:ConfigurationGroup=$(BuildConfiguration) /p:TargetArchitecture=$(PB_TargetArchitecture) /p:PortableBuild=$(PB_PortableBuild)" }, "OfficialBuildId": { "value": "$(Build.BuildNumber)" diff --git a/buildpipeline/pipeline.json b/buildpipeline/pipeline.json index f1ff01e6..2c09a3a6 100644 --- a/buildpipeline/pipeline.json +++ b/buildpipeline/pipeline.json @@ -18,7 +18,6 @@ { "Name": "Core-Setup-Linux-BT", "Parameters": { - "PB_DistroRid": "rhel.7.2-x64", "PB_DockerTag": "rhel7_prereqs_2", "PB_AdditionalBuildArguments":"-PortableBuild=true -strip-symbols", "PB_PortableBuild": "true" @@ -33,10 +32,10 @@ { "Name": "Core-Setup-Linux-Arm-BT", "Parameters": { - "PB_DistroRid": "rhel.6-x64", "PB_DockerTag": "centos-6-c8c9b08-20174310104313", "PB_TargetArchitecture": "x64", - "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -DistroRid=rhel.6-x64 -PortableBuild=false -strip-symbols", + "PB_AdditionalBuildArguments":"-TargetArchitecture=x64 -PortableBuild=false -strip-symbols", + "PB_AdditionalMSBuildArguments":"/p:OutputRid=rhel.6-x64", "PB_PortableBuild": "false" }, "ReportingParameters": { @@ -48,10 +47,9 @@ { "Name": "Core-Setup-Linux-Arm-BT", "Parameters": { - "PB_DistroRid": "ubuntu.14.04-arm", "PB_DockerTag": "ubuntu-14.04-cross-0cd4667-20172211042239", "PB_TargetArchitecture": "arm", - "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DistroRid=linux-arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols", + "PB_AdditionalBuildArguments":"-TargetArchitecture=arm -DisableCrossgen=true -PortableBuild=true -SkipTests=true -CrossBuild=true -strip-symbols", "PB_CrossBuildArgs": "-e ROOTFS_DIR ", "PB_PortableBuild": "true" }, @@ -80,7 +78,6 @@ "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true", "PB_TargetArchitecture": "arm", - "PB_DistroRid": "win-arm", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -95,7 +92,6 @@ "Parameters": { "PB_AdditionalBuildArguments": "/p:SkipTests=true /p:NativeToolSetDir=C:\\tools\\clr", "PB_TargetArchitecture": "arm64", - "PB_DistroRid": "win-arm64", "PB_PortableBuild": "true" }, "ReportingParameters": { @@ -108,7 +104,6 @@ { "Name": "Core-Setup-Windows-BT", "Parameters": { - "PB_DistroRid": "win7-x64", "PB_TargetArchitecture": "x64", "PB_PortableBuild": "true", "PB_PublishRidAgnosticPackages": "true", @@ -124,7 +119,6 @@ { "Name": "Core-Setup-Windows-BT", "Parameters": { - "PB_DistroRid": "win7-x86", "PB_TargetArchitecture": "x86", "PB_PortableBuild": "true" }, diff --git a/config.json b/config.json index 821b39cd..27a0ed67 100644 --- a/config.json +++ b/config.json @@ -30,12 +30,6 @@ "values": [ "True", "False"], "defaultValue": "False" }, - "DistroRid": { - "description": "Specifies the distro rid for Unix OS.", - "valueType": "property", - "values": [], - "defaultValue": "${OSRid}-${CPUArch}" - }, "TargetArchitecture":{ "description": "Build for the specified architecture (x64, x86 (supported only on Windows), arm, or arm64, default: x64)", "valueType": "property", @@ -264,7 +258,6 @@ "TargetArchitecture": "default", "OSGroup": "default", "MsBuildLogging":"default", - "DistroRid":"default", "Project":"build.proj" } } diff --git a/dir.props b/dir.props index 456b77c0..3df1d690 100644 --- a/dir.props +++ b/dir.props @@ -197,33 +197,27 @@ netcoreapp2.0 - - win7-x86 - win7-x64 - win8-arm - win10-arm64 - - - osx.10.12-x64 - - - $(DistroRid) + + + + $(HostMachineRid.Remove($(HostMachineRid.LastIndexOf('-'))))-$(TargetArchitecture) + - win-$(TargetArchitecture) - osx-$(TargetArchitecture) - linux-$(TargetArchitecture) + win-$(TargetArchitecture) + osx-$(TargetArchitecture) + linux-$(TargetArchitecture) - win10-$(TargetArchitecture) - $(TargetRid) + $(OutputRid) - $(TargetRid).$(ConfigurationGroup) + $(OutputRid).$(ConfigurationGroup) $(BinDir) $(BaseOutputPath)$(OSPlatformConfig)\ @@ -246,7 +240,7 @@ false - $(BaseOutputRootPath)sharedfx_$(TargetRid)_$(ConfigurationGroup)_version_badge.svg + $(BaseOutputRootPath)sharedfx_$(OutputRid)_$(ConfigurationGroup)_version_badge.svg @@ -283,39 +277,39 @@ false - + true - + true true - + true true true - + true true true - + true true true - + true true @@ -342,14 +336,14 @@ - - $(TargetRid) - osx.10.10-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 - rhel.7-x64 + + $(OutputRid) + osx.10.10-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 + rhel.7-x64 $(SharedFrameworkNugetVersion)-$(PackageTargetRid) $(HostResolverVersion)-$(PackageTargetRid) diff --git a/netci.groovy b/netci.groovy index 2f47d3dd..d642b519 100644 --- a/netci.groovy +++ b/netci.groovy @@ -48,7 +48,7 @@ platformList.each { platform -> dockerContainer = "ubuntu1404_cross_prereqs_v4-tizen_rootfs" dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture}.tizen.build --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildArgs += " -DistroRid=tizen.4.0.0-${architecture} -SkipTests=true -DisableCrossgen=true -PortableBuild=false -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json" + buildArgs += " -SkipTests=true -DisableCrossgen=true -PortableBuild=false -CrossBuild=true -- /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.4.0.0-${architecture}" buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" } else if (os == "Linux") { @@ -57,7 +57,7 @@ platformList.each { platform -> if (architecture == 'arm' || architecture == 'armel') { dockerContainer = "ubuntu-14.04-cross-0cd4667-20172211042239" dockerCommand = "docker run -e ROOTFS_DIR=/crossrootfs/${architecture} --name ${dockerContainer} --rm -v \${WORKSPACE}:${dockerWorkingDirectory} -w=${dockerWorkingDirectory} ${dockerRepository}:${dockerContainer}" - buildArgs += " -DistroRid=linux-${architecture} -SkipTests=true -DisableCrossgen=true -CrossBuild=true" + buildArgs += " -SkipTests=true -DisableCrossgen=true -CrossBuild=true" buildCommand = "${dockerCommand} ./build.sh ${buildArgs}" osForGHTrigger = "Linux" diff --git a/publish/dir.props b/publish/dir.props index 95245d2b..5b34dc5c 100644 --- a/publish/dir.props +++ b/publish/dir.props @@ -12,12 +12,7 @@ Runtime/$(ProductVersion) .sha512 - - - $(DistroRid).$(SharedFrameworkNugetVersion) - $(DistroRid).$(HostResolverVersion) - - + $(BinariesRelativePath) diff --git a/publish/dir.targets b/publish/dir.targets index 9d0b8691..ba358b34 100644 --- a/publish/dir.targets +++ b/publish/dir.targets @@ -63,7 +63,7 @@ - $([System.String]::Copy($(DistroRid)).Replace('.', '')) + $([System.String]::Copy($(OutputRid)).Replace('.', '')) %(RepoIds.Key) - + <_sourcePathCandidate Include="@(FilesToPackage->'$(PackagesDir)\%(NuGetPackageId)\%(NuGetPackageVersion)\sources')" /> <_sourcePathCandidate Include="@(FilesToPackage->'$(PackagesDir)\%(NuGetPackageId)\%(NuGetPackageVersion)\src')" /> diff --git a/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj b/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj index bfa67b05..2aa94ecc 100644 --- a/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj +++ b/src/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj @@ -134,7 +134,7 @@ - + <_sourcePathCandidate Include="@(FilesToPackage->'$(PackagesDir)\%(NuGetPackageId)\%(NuGetPackageVersion)\sources')" /> <_sourcePathCandidate Include="@(FilesToPackage->'$(PackagesDir)\%(NuGetPackageId)\%(NuGetPackageVersion)\src')" /> diff --git a/src/pkg/projects/dir.props b/src/pkg/projects/dir.props index 139a6cb6..9b49bdb8 100644 --- a/src/pkg/projects/dir.props +++ b/src/pkg/projects/dir.props @@ -13,6 +13,9 @@ $(NuGetRuntimeIdentifier) true + + false + true From 1063874bdcff70192516ba374c173296eeb84301 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Wed, 4 Oct 2017 17:51:07 -0500 Subject: [PATCH 198/198] Build custom tasks for net45 on Windows, even when building in source-build. --- .../Microsoft.DotNet.Build.Tasks.Local.builds | 2 +- tools-local/dir.props | 9 +++++++++ tools-local/tasks/core-setup.tasks.builds | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 tools-local/dir.props diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds index 41939dc5..9a68fadf 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds @@ -6,7 +6,7 @@ TargetGroup=netstandard1.5 + Condition="'$(BuildCustomTasksForDesktop)' == 'true'"> TargetGroup=net45 diff --git a/tools-local/dir.props b/tools-local/dir.props new file mode 100644 index 00000000..ed4b80b9 --- /dev/null +++ b/tools-local/dir.props @@ -0,0 +1,9 @@ + + + + + + true + + + \ No newline at end of file diff --git a/tools-local/tasks/core-setup.tasks.builds b/tools-local/tasks/core-setup.tasks.builds index 41939dc5..9a68fadf 100644 --- a/tools-local/tasks/core-setup.tasks.builds +++ b/tools-local/tasks/core-setup.tasks.builds @@ -6,7 +6,7 @@ TargetGroup=netstandard1.5 + Condition="'$(BuildCustomTasksForDesktop)' == 'true'"> TargetGroup=net45