From cf1dc80a523fb5bd50b3572ffd2c10e164e54af4 Mon Sep 17 00:00:00 2001 From: Swaroop Sridhar Date: Wed, 27 Mar 2019 12:49:35 -0700 Subject: [PATCH] Rename Microsoft.Dotnet.Build.Bundle to Microsoft.NET.Build.Bundle (dotnet/core-setup#5581) Rename the Bundler package to match other tools in the toolset repository. Commit migrated from https://github.com/dotnet/core-setup/commit/3460b19cf6ade03882e7b168a3295f959074d7c6 --- Microsoft.DotNet.CoreSetup.sln | 72 +++++++++++----------- .../BundleException.cs | 2 +- .../Bundler.cs | 2 +- .../Extractor.cs | 2 +- .../FileEntry.cs | 2 +- .../FileType.cs | 2 +- .../Manifest.cs | 2 +- .../Microsoft.NET.Build.Bundle.csproj} | 0 .../Program.cs | 2 +- .../README.md | 0 .../Sdk.props | 4 +- src/installer/managed/dir.proj | 2 +- src/installer/pkg/packaging/dir.proj | 2 +- .../BundleAndExtract.cs | 4 +- .../Microsoft.NET.Build.Bundle.Tests.csproj} | 8 +-- src/installer/test/dir.props | 2 +- 16 files changed, 54 insertions(+), 54 deletions(-) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/BundleException.cs (92%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/Bundler.cs (99%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/Extractor.cs (98%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/FileEntry.cs (97%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/FileType.cs (97%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/Manifest.cs (98%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle/Microsoft.DotNet.Build.Bundle.csproj => Microsoft.NET.Build.Bundle/Microsoft.NET.Build.Bundle.csproj} (100%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/Program.cs (99%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/README.md (100%) rename src/installer/managed/{Microsoft.DotNet.Build.Bundle => Microsoft.NET.Build.Bundle}/Sdk.props (90%) rename src/installer/test/{Microsoft.DotNet.Build.Bundle.Tests => Microsoft.NET.Build.Bundle.Tests}/BundleAndExtract.cs (96%) rename src/installer/test/{Microsoft.DotNet.Build.Bundle.Tests/Microsoft.DotNet.Build.Bundle.Tests.csproj => Microsoft.NET.Build.Bundle.Tests/Microsoft.NET.Build.Bundle.Tests.csproj} (63%) diff --git a/Microsoft.DotNet.CoreSetup.sln b/Microsoft.DotNet.CoreSetup.sln index 6404cbf..b00872d 100644 --- a/Microsoft.DotNet.CoreSetup.sln +++ b/Microsoft.DotNet.CoreSetup.sln @@ -23,9 +23,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Depend EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\test\TestUtils\TestUtils.csproj", "{D6676666-D14D-4DFA-88FB-76E3E823E2E1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Bundle", "src\managed\Microsoft.DotNet.Build.Bundle\Microsoft.DotNet.Build.Bundle.csproj", "{6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Bundle", "src\managed\Microsoft.NET.Build.Bundle\Microsoft.NET.Build.Bundle.csproj", "{37B7E731-BEDE-45BF-AEC7-457333F23E53}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Build.Bundle.Tests", "src\test\Microsoft.DotNet.Build.Bundle.Tests\Microsoft.DotNet.Build.Bundle.Tests.csproj", "{89374278-6DEB-48EF-9AFC-7D1BF340C49D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Build.Bundle.Tests", "src\test\Microsoft.NET.Build.Bundle.Tests\Microsoft.NET.Build.Bundle.Tests.csproj", "{8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -119,38 +119,38 @@ Global {D6676666-D14D-4DFA-88FB-76E3E823E2E1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {D6676666-D14D-4DFA-88FB-76E3E823E2E1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {D6676666-D14D-4DFA-88FB-76E3E823E2E1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Debug|x64.ActiveCfg = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Debug|x64.Build.0 = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Release|Any CPU.Build.0 = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Release|x64.ActiveCfg = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.Release|x64.Build.0 = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Debug|x64.ActiveCfg = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Debug|x64.Build.0 = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Release|Any CPU.Build.0 = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Release|x64.ActiveCfg = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.Release|x64.Build.0 = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {89374278-6DEB-48EF-9AFC-7D1BF340C49D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Debug|x64.ActiveCfg = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Debug|x64.Build.0 = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Release|Any CPU.Build.0 = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Release|x64.ActiveCfg = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.Release|x64.Build.0 = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {37B7E731-BEDE-45BF-AEC7-457333F23E53}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Debug|x64.Build.0 = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Release|Any CPU.Build.0 = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Release|x64.ActiveCfg = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.Release|x64.Build.0 = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -161,8 +161,8 @@ Global {23F4AB97-D15C-4C51-A641-DF5C5D5EF70F} = {5CE8410C-3100-4F41-8FA9-E6B4132D9703} {D86A859D-E6FA-4E73-A255-5776FC473A25} = {5CE8410C-3100-4F41-8FA9-E6B4132D9703} {D6676666-D14D-4DFA-88FB-76E3E823E2E1} = {5CE8410C-3100-4F41-8FA9-E6B4132D9703} - {6C49FB1B-2C7D-49C5-8471-FFA4861D30DD} = {FAA448DA-7D1C-4481-915D-5765BF906332} - {89374278-6DEB-48EF-9AFC-7D1BF340C49D} = {5CE8410C-3100-4F41-8FA9-E6B4132D9703} + {37B7E731-BEDE-45BF-AEC7-457333F23E53} = {FAA448DA-7D1C-4481-915D-5765BF906332} + {8E21F355-54D0-46C3-ACC6-B1BC5D11FDCF} = {5CE8410C-3100-4F41-8FA9-E6B4132D9703} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28B9726D-802B-478D-AF7A-B9243B9E180B} diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/BundleException.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/BundleException.cs similarity index 92% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/BundleException.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/BundleException.cs index 160af0c..3725098 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/BundleException.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/BundleException.cs @@ -4,7 +4,7 @@ using System; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// This exception is thrown when a bundle/extraction diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Bundler.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/Bundler.cs similarity index 99% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Bundler.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/Bundler.cs index 1cfa059..8019c49 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Bundler.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/Bundler.cs @@ -6,7 +6,7 @@ using System; using System.IO; using System.Reflection.PortableExecutable; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// Bundler: Functionality to embed the managed app and its dependencies diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Extractor.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/Extractor.cs similarity index 98% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Extractor.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/Extractor.cs index dcb0bd6..b537d65 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Extractor.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/Extractor.cs @@ -5,7 +5,7 @@ using System; using System.IO; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// Extractor: The functionality to extract the files embedded diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/FileEntry.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/FileEntry.cs similarity index 97% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/FileEntry.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/FileEntry.cs index 4d9c8ae..d2361f8 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/FileEntry.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/FileEntry.cs @@ -5,7 +5,7 @@ using System; using System.IO; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// FileEntry: Records information about embedded files. diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/FileType.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/FileType.cs similarity index 97% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/FileType.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/FileType.cs index b8e5e74..f191789 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/FileType.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/FileType.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// FileType: Identifies the type of file embedded into the bundle. diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Manifest.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/Manifest.cs similarity index 98% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Manifest.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/Manifest.cs index f0fd58c..2d0ef2e 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Manifest.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/Manifest.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// BundleManifest is a description of the contents of a bundle file. diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Microsoft.DotNet.Build.Bundle.csproj b/src/installer/managed/Microsoft.NET.Build.Bundle/Microsoft.NET.Build.Bundle.csproj similarity index 100% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Microsoft.DotNet.Build.Bundle.csproj rename to src/installer/managed/Microsoft.NET.Build.Bundle/Microsoft.NET.Build.Bundle.csproj diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Program.cs b/src/installer/managed/Microsoft.NET.Build.Bundle/Program.cs similarity index 99% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Program.cs rename to src/installer/managed/Microsoft.NET.Build.Bundle/Program.cs index 05e0a11..f56b0e3 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Program.cs +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/Program.cs @@ -4,7 +4,7 @@ using System; -namespace Microsoft.DotNet.Build.Bundle +namespace Microsoft.NET.Build.Bundle { /// /// The main driver for Bundle and Extract operations. diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/README.md b/src/installer/managed/Microsoft.NET.Build.Bundle/README.md similarity index 100% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/README.md rename to src/installer/managed/Microsoft.NET.Build.Bundle/README.md diff --git a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Sdk.props b/src/installer/managed/Microsoft.NET.Build.Bundle/Sdk.props similarity index 90% rename from src/installer/managed/Microsoft.DotNet.Build.Bundle/Sdk.props rename to src/installer/managed/Microsoft.NET.Build.Bundle/Sdk.props index be051a8..280c976 100644 --- a/src/installer/managed/Microsoft.DotNet.Build.Bundle/Sdk.props +++ b/src/installer/managed/Microsoft.NET.Build.Bundle/Sdk.props @@ -12,7 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved. - $(MSBuildThisFileDirectory)..\tools\Microsoft.DotNet.Build.Bundle.dll + $(MSBuildThisFileDirectory)..\tools\Microsoft.NET.Build.Bundle.dll - \ No newline at end of file + diff --git a/src/installer/managed/dir.proj b/src/installer/managed/dir.proj index 9d80ca7..3ebae8f 100644 --- a/src/installer/managed/dir.proj +++ b/src/installer/managed/dir.proj @@ -10,7 +10,7 @@ - + diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj index abb8040..c2c9b53 100644 --- a/src/installer/pkg/packaging/dir.proj +++ b/src/installer/pkg/packaging/dir.proj @@ -176,7 +176,7 @@ - + diff --git a/src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/BundleAndExtract.cs b/src/installer/test/Microsoft.NET.Build.Bundle.Tests/BundleAndExtract.cs similarity index 96% rename from src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/BundleAndExtract.cs rename to src/installer/test/Microsoft.NET.Build.Bundle.Tests/BundleAndExtract.cs index 5b5671d..55894fb 100644 --- a/src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/BundleAndExtract.cs +++ b/src/installer/test/Microsoft.NET.Build.Bundle.Tests/BundleAndExtract.cs @@ -47,9 +47,9 @@ namespace Microsoft.DotNet.CoreSetup.Test.BundleTests.BundleExtract // Bundle to a single-file string bundleDll = Path.Combine(sharedTestState.RepoDirectories.Artifacts, - "Microsoft.DotNet.Build.Bundle", + "Microsoft.NET.Build.Bundle", "netcoreapp2.0", - "Microsoft.DotNet.Build.Bundle.dll"); + "Microsoft.NET.Build.Bundle.dll"); string[] bundleArgs = { "--source", publishDir, "--apphost", hostName, "--output", singleFileDir }; diff --git a/src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/Microsoft.DotNet.Build.Bundle.Tests.csproj b/src/installer/test/Microsoft.NET.Build.Bundle.Tests/Microsoft.NET.Build.Bundle.Tests.csproj similarity index 63% rename from src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/Microsoft.DotNet.Build.Bundle.Tests.csproj rename to src/installer/test/Microsoft.NET.Build.Bundle.Tests/Microsoft.NET.Build.Bundle.Tests.csproj index f6b6170..37d123d 100644 --- a/src/installer/test/Microsoft.DotNet.Build.Bundle.Tests/Microsoft.DotNet.Build.Bundle.Tests.csproj +++ b/src/installer/test/Microsoft.NET.Build.Bundle.Tests/Microsoft.NET.Build.Bundle.Tests.csproj @@ -1,10 +1,10 @@  - Microsoft.DotNet.Build.Bundle.Tests + Microsoft.NET.Build.Bundle.Tests netcoreapp2.0 - Microsoft.DotNet.Build.Bundle.Tests - Microsoft.DotNet.Build.Bundle.Tests + Microsoft.NET.Build.Bundle.Tests + Microsoft.NET.Build.Bundle.Tests true @@ -16,7 +16,7 @@ - + diff --git a/src/installer/test/dir.props b/src/installer/test/dir.props index 2f207f4..bc270c9 100644 --- a/src/installer/test/dir.props +++ b/src/installer/test/dir.props @@ -8,7 +8,7 @@ - + -- 2.7.4