From b49ffc9e9e05d0eead4a5220375dd3ca76040e24 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 25 Oct 2017 17:39:32 -0700 Subject: [PATCH] Remove All metapackage and runtime store infrastructure (#244) --- MetaPackages.sln | 15 - build/BuildArchive.proj | 13 - build/dependencies.props | 189 ---- build/repo.props | 5 - build/repo.targets | 970 ------------------ build/tasks/CreateCommonManifest.cs | 67 -- build/tasks/RepoTasks.csproj | 10 - build/tasks/RepoTasks.tasks | 3 - .../Archive.AspNetCore.All.csproj | 24 - .../Microsoft.AspNetCore.All.csproj | 23 - ...ublishWithAspNetCoreTargetManifest.targets | 29 - .../Microsoft.AspNetCore.All.targets | 3 - .../lib/netcoreapp2.0/_._ | 0 .../Microsoft.AspNetCore.RuntimeStore.csproj | 10 - .../Microsoft.AspNetCore.csproj | 16 +- .../Build.RuntimeStore.References.csproj | 20 - ....AspNetCore.HostingStartup.Template.csproj | 21 - .../Program.cs | 7 - tools/TrimDeps/Program.cs | 47 - tools/TrimDeps/TrimDeps.csproj | 12 - tools/docker/debian.8/Dockerfile | 51 - tools/docker/rhel.7/Dockerfile | 27 - tools/docker/ubuntu.14.04/Dockerfile | 52 - tools/docker/ubuntu.16.04/Dockerfile | 48 - tools/docker/ubuntu.16.10/Dockerfile | 52 - tools/dotnet-deb-tool-consumer/NuGet.config | 6 - .../dotnet-deb-tool-consumer.csproj | 11 - tools/packaging/changelog | 2 - tools/packaging/hosting_debian_config.json | 35 - tools/packaging/store_debian_config.json | 30 - tools/scripts/GetSharedFrameworkVersion.ps1 | 6 - tools/scripts/GetSharedFrameworkVersion.sh | 2 - tools/scripts/TestInstallers.sh | 77 -- tools/scripts/zip2tgz.sh | 31 - 34 files changed, 15 insertions(+), 1899 deletions(-) delete mode 100644 build/BuildArchive.proj delete mode 100644 build/repo.targets delete mode 100644 build/tasks/CreateCommonManifest.cs delete mode 100644 build/tasks/RepoTasks.csproj delete mode 100644 build/tasks/RepoTasks.tasks delete mode 100644 src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj delete mode 100644 src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj delete mode 100644 src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets delete mode 100644 src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets delete mode 100644 src/Microsoft.AspNetCore.All/lib/netcoreapp2.0/_._ delete mode 100644 src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj delete mode 100644 tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj delete mode 100644 tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj delete mode 100644 tools/Microsoft.AspNetCore.HostingStartup.Template/Program.cs delete mode 100644 tools/TrimDeps/Program.cs delete mode 100644 tools/TrimDeps/TrimDeps.csproj delete mode 100644 tools/docker/debian.8/Dockerfile delete mode 100644 tools/docker/rhel.7/Dockerfile delete mode 100644 tools/docker/ubuntu.14.04/Dockerfile delete mode 100644 tools/docker/ubuntu.16.04/Dockerfile delete mode 100644 tools/docker/ubuntu.16.10/Dockerfile delete mode 100644 tools/dotnet-deb-tool-consumer/NuGet.config delete mode 100644 tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj delete mode 100644 tools/packaging/changelog delete mode 100644 tools/packaging/hosting_debian_config.json delete mode 100644 tools/packaging/store_debian_config.json delete mode 100644 tools/scripts/GetSharedFrameworkVersion.ps1 delete mode 100755 tools/scripts/GetSharedFrameworkVersion.sh delete mode 100755 tools/scripts/TestInstallers.sh delete mode 100755 tools/scripts/zip2tgz.sh diff --git a/MetaPackages.sln b/MetaPackages.sln index 3a53e49bdd..659427dfcb 100644 --- a/MetaPackages.sln +++ b/MetaPackages.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore", "src\Microsoft.AspNetCore\Microsoft.AspNetCore.csproj", "{6F3D43F7-9546-4B41-AF04-CF4708B62051}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.All", "src\Microsoft.AspNetCore.All\Microsoft.AspNetCore.All.csproj", "{CC8F551E-213A-45E8-AECA-507C4DB4F164}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{97D53BEB-A511-4FBE-B784-AB407D9A219F}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props @@ -43,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StartRequestDelegateUrlApp" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CreateDefaultBuilderApp", "test\TestSites\CreateDefaultBuilderApp\CreateDefaultBuilderApp.csproj", "{79CF58CE-B020-45D8-BDB5-2D8036BEAD14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrimDeps", "tools\TrimDeps\TrimDeps.csproj", "{67E4C92F-6D12-4C52-BB79-B8D11BFC6B82}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjectionApp", "test\TestSites\DependencyInjectionApp\DependencyInjectionApp.csproj", "{65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateDefaultBuilderOfTApp", "test\TestSites\CreateDefaultBuilderOfTApp\CreateDefaultBuilderOfTApp.csproj", "{A922B5AC-836B-44F4-83F1-3CB9EB08A3F8}" @@ -61,10 +57,6 @@ Global {6F3D43F7-9546-4B41-AF04-CF4708B62051}.Debug|Any CPU.Build.0 = Debug|Any CPU {6F3D43F7-9546-4B41-AF04-CF4708B62051}.Release|Any CPU.ActiveCfg = Release|Any CPU {6F3D43F7-9546-4B41-AF04-CF4708B62051}.Release|Any CPU.Build.0 = Release|Any CPU - {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.Build.0 = Release|Any CPU {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {AF5BB04E-92F7-4737-8B98-F86F6244FAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -89,10 +81,6 @@ Global {79CF58CE-B020-45D8-BDB5-2D8036BEAD14}.Debug|Any CPU.Build.0 = Debug|Any CPU {79CF58CE-B020-45D8-BDB5-2D8036BEAD14}.Release|Any CPU.ActiveCfg = Release|Any CPU {79CF58CE-B020-45D8-BDB5-2D8036BEAD14}.Release|Any CPU.Build.0 = Release|Any CPU - {67E4C92F-6D12-4C52-BB79-B8D11BFC6B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {67E4C92F-6D12-4C52-BB79-B8D11BFC6B82}.Debug|Any CPU.Build.0 = Debug|Any CPU - {67E4C92F-6D12-4C52-BB79-B8D11BFC6B82}.Release|Any CPU.ActiveCfg = Release|Any CPU - {67E4C92F-6D12-4C52-BB79-B8D11BFC6B82}.Release|Any CPU.Build.0 = Release|Any CPU {65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Debug|Any CPU.Build.0 = Debug|Any CPU {65FE2E38-4529-4C93-A7B0-CF12DD7A70C3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -111,8 +99,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {6F3D43F7-9546-4B41-AF04-CF4708B62051} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} - {CC8F551E-213A-45E8-AECA-507C4DB4F164} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} - {F92CB7A1-C38E-408C-A7EC-A5C040D041E1} = {97D53BEB-A511-4FBE-B784-AB407D9A219F} {AF5BB04E-92F7-4737-8B98-F86F6244FAB2} = {192F583C-C4CA-43E5-B31C-D21B7806E274} {C72A756A-D29D-44C7-83D4-821DBE82DBCA} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C} {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C} @@ -120,7 +106,6 @@ Global {3A85FA52-F601-422E-A42E-9F187DB28492} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} {401C741B-6C7C-4E08-9F09-C3D43D22C0DE} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} {79CF58CE-B020-45D8-BDB5-2D8036BEAD14} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} - {67E4C92F-6D12-4C52-BB79-B8D11BFC6B82} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} {65FE2E38-4529-4C93-A7B0-CF12DD7A70C3} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} {A922B5AC-836B-44F4-83F1-3CB9EB08A3F8} = {EC22261D-0DE1-47DE-8F7C-072675D6F5B4} {BD08F027-3BB9-427B-9367-19534B7376B3} = {9E49B5B9-9E72-42FB-B684-90CA1B1BCF9C} diff --git a/build/BuildArchive.proj b/build/BuildArchive.proj deleted file mode 100644 index 3d2110bddc..0000000000 --- a/build/BuildArchive.proj +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/build/dependencies.props b/build/dependencies.props index 64bc851be2..4dfc6e6b11 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,7 +5,6 @@ 0.5.0-* 2.1.0-* - $(VersionPrefix)-$(VersionSuffix) 4.4.0-* 2.0.0-preview2-* 2.1.1-* @@ -17,192 +16,4 @@ 2.3.0 - - - - - $(AspNetCoreVersion) - None - - - $(AspNetCoreVersion) - None - - - $(AspNetCoreVersion) - Compile - - - $(AspNetCoreVersion) - None - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/repo.props b/build/repo.props index c5d1122efe..39ccbe3845 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,8 +1,3 @@ - - - - - diff --git a/build/repo.targets b/build/repo.targets deleted file mode 100644 index 3837b8f554..0000000000 --- a/build/repo.targets +++ /dev/null @@ -1,970 +0,0 @@ - - - - $(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\ - $(MetaPackagePath)Microsoft.AspNetCore.RuntimeStore.csproj - - $(RepositoryRoot)tools\Microsoft.AspNetCore.HostingStartup.Template\ - $(HostingStartupTemplatePath)Microsoft.AspNetCore.HostingStartup.Template.csproj - - - $(RepositoryRoot)src\Archive.AspNetCore.All\ - $(FallbackArchiveDir)Archive.AspNetCore.All.csproj - - - $(TIMESTAMP_FREE_VERSION) - final - - $(VersionPrefix)-$(OriginalVersionSuffix)-$(NoTimestampSuffix) - $(VersionPrefix) - $(VersionPrefix)-$(OriginalVersionSuffix)-$(BuildNumber) - - aspnetcore-store-$(TimestampVersion) - aspnetcore-store-$(NoTimestampVersion) - dotnet-hosting-$(TimestampVersion) - dotnet-hosting-$(NoTimestampVersion) - - $(RepositoryRoot).rw\ - $(RepositoryRoot).ro\ - $(RepositoryRoot)artifacts\ - $(ArtifactsDir)dotnetInstallers\ - $(ArtifactsDir)zip\ - $(ArtifactsDir)deps\ - $(ArtifactsZipDir)t\ - $(ArtifactsZipDir)n\ - $(ArtifactsZipDir)st\ - $(ArtifactsZipDir)sn\ - $(ArtifactsDir)installers\ - $(ArtifactsDir)rsArchive\ - $(ArtifactsDir)StoreTimestampLayout\ - $(RuntimeStoreInstallerLayoutTimestampDirectory)package_root\ - $(ArtifactsDir)StoreTimestampOutput\ - $(ArtifactsDir)StoreNoTimestampLayout\ - $(RuntimeStoreInstallerLayoutNoTimestampDirectory)package_root\ - $(ArtifactsDir)StoreNoTimestampOutput\ - $(ArtifactsDir)HostingTimestampLayout\ - $(HostingBundleInstallerLayoutTimestampDirectory)package_root\ - $(ArtifactsDir)HostingTimestampOutput\ - $(ArtifactsDir)HostingNoTimestampLayout\ - $(HostingBundleInstallerLayoutNoTimestampDirectory)package_root\ - $(ArtifactsDir)HostingNoTimestampOutput\ - $(ArtifactsDir)temp\ - $(RepositoryRoot)tools\ - $(ToolsDir)packaging\ - $(ToolsDir)scripts\ - $(ToolsDir)docker\ - $(RepositoryRoot).deps\build\ - $(ToolsDir)Build.RuntimeStore.References\ - $(RuntimeStoreReferenceDirectory)bin\Release\ - $(PackagingDir)store_debian_config.json - $(PackagingDir)hosting_debian_config.json - $(PackagingDir)changelog - $(ToolsDir)dotnet-deb-tool-consumer\ - /opt/code/ - - - - - - - - - - - - - - - - - - - win7-$(PACKAGE_CACHE_PLATFORM) - linux-$(PACKAGE_CACHE_PLATFORM) - osx-$(PACKAGE_CACHE_PLATFORM) - - $(ArtifactsDir)aspnetcore-store-$(TimestampVersion)-$(RID).zip - $(ArtifactsDir)aspnetcore-store-$(NoTimestampVersion)-$(RID).zip - $(ArtifactsDir)aspnetcore-symbols-$(TimestampVersion)-$(RID).zip - $(ArtifactsDir)aspnetcore-symbols-$(NoTimestampVersion)-$(RID).zip - $(ArtifactsDir)aspnetcore-symbols-$(TimestampVersion)-$(RID).tar.gz - $(ArtifactsDir)aspnetcore-symbols-$(NoTimestampVersion)-$(RID).tar.gz - - - - - - - - - - - - - - - - - - - - - - - - aspnetcore-store-$(TimestampVersion)-$(RID).xml - - <_RuntimeStoreFiles Include="$(RuntimeStoreOutputPath)**\*" Exclude="$(RuntimeStoreOutputPath)**\artifact.xml;$(RuntimeStoreOutputPath)symbols\**\*" /> - - $([System.String]::new('%(RecursiveDir)').Replace('$(TimestampVersion)', '$(NoTimestampVersion)')) - - <_RuntimeStoreSymbolFiles Include="$(RuntimeStoreOutputPath)symbols\**\*" /> - - $([System.String]::new('%(RecursiveDir)').Replace('$(TimestampVersion)', '$(NoTimestampVersion)')) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - aspnetcore-store-$(TimestampVersion)-common.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(DotnetHomeDirectory)shared\Microsoft.NETCore.App\$(SharedFrameworkVersion) - - - - - - - - - - - - - - - - - - - - - - - - - $(FallbackArchiveDir)obj/$(OutputPackageName) - $(RepositoryRoot)artifacts\$(OutputPackageName).lzma - $(FallbackArchiveDir)\obj\$(OutputPackageName).NuGet.config - - - - - - - - - - - - - - - - - - - - - - - - - $(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages-NoTimeStamp - $(COHERENCE_SIGNED_DROP_LOCATION)\Signed\Packages - nuGetPackagesArchive-$(NoTimestampVersion) - nuGetPackagesArchive-$(TimestampVersion) - - - - - - - - - - - $(PublishShare)\fallbackArchives - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://dotnetcli.azureedge.net/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-host-$(SharedFrameworkVersion) - http://dotnetcli.azureedge.net/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-hostfxr-$(SharedFrameworkVersion) - http://dotnetcli.azureedge.net/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-runtime-$(SharedFrameworkVersion) - http://dotnetcli.azureedge.net/dotnet/Runtime/$(SharedFrameworkVersion)/dotnet-runtime-$(SharedFrameworkVersion)-linux-x64.tar.gz - - - - - - - - - - - - - - - - - - - - - - - - $(HostingBundleTimestampInstallerPackageName)-linux-$(PACKAGE_CACHE_PLATFORM).tar.gz - $(HostingBundleNoTimestampInstallerPackageName)-linux-$(PACKAGE_CACHE_PLATFORM).tar.gz - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @(_StoreInstallerSummary) - @(_StoreInstallerDescription) - @(_StoreInstallerLicense) - @(_StoreInstallerPackageRevision) - @(_StoreInstallerHomepage) - @(_StoreInstallerMaintainerName) - @(_StoreInstallerMaintainerEmail) - @(_HostingInstallerSummary) - @(_HostingInstallerDescription) - @(_HostingInstallerLicense) - @(_HostingInstallerPackageRevision) - @(_HostingInstallerHomepage) - @(_HostingInstallerMaintainerName) - @(_HostingInstallerMaintainerEmail) - /opt/rh/rh-dotnet20/root/usr/lib64/dotnet/ - @(RHStoreDirectories->' --directories "%(FullPath)"', ' ') - /usr/share/dotnet/ - @(GeneralStoreDirectories->' --directories "%(FullPath)"', ' ') - - - - - - - - - - - - - - - - $(RuntimeStoreTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).rpm - $(RuntimeStoreNoTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).rpm - $(HostingBundleTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).rpm - $(HostingBundleNoTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).rpm - $(StoreInstallerMaintainerName) <$(StoreInstallerMaintainerEmail)> - $(HostingInstallerMaintainerName) <$(HostingInstallerMaintainerEmail)> - .NET Foundation - - - - - - - - - - - - - - - - - $(TimestampVersion) - - - $(SharedFrameworkVersion) - - - $(NoTimestampVersion) - - - $(SharedFrameworkVersion) - - - - - @(HostingBundleTimestampDependencies->' -d "%(Identity) >= %(Version)"', ' ') - @(HostingBundleNoTimestampDependencies->' -d "%(Identity) >= %(Version)"', ' ') - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(RuntimeStoreTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).deb - $(RuntimeStoreNoTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).deb - $(HostingBundleTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).deb - $(HostingBundleNoTimestampInstallerPackageName)-$(InstallerPlatform)-$(PACKAGE_CACHE_PLATFORM).deb - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/tasks/CreateCommonManifest.cs b/build/tasks/CreateCommonManifest.cs deleted file mode 100644 index 4125bbccae..0000000000 --- a/build/tasks/CreateCommonManifest.cs +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Linq; -using System.Xml; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks -{ - /// - /// Creates a common manifest file used for trimming publish output given a list of packages and package definitions containing their versions. - /// - public class CreateCommonManifest : Task - { - /// - /// The path for the common manifest file to be created. - /// - /// - [Required] - public string DestinationFilePath { get; set; } - - /// - /// The packages to include in the common manifest file. - /// - /// - [Required] - public ITaskItem[] Packages { get; set; } - - /// - /// The package definitions used for resolving package versions. - /// - /// - [Required] - public ITaskItem[] PackageDefinitions { get; set; } - - public override bool Execute() - { - var xmlDoc = new XmlDocument(); - var packagesElement = xmlDoc.CreateElement("StoreArtifacts"); - - foreach (var package in Packages) - { - var packageName = package.ItemSpec; - var packageElement = xmlDoc.CreateElement("Package"); - - var idAttribute = xmlDoc.CreateAttribute("Id"); - idAttribute.Value = packageName; - packageElement.Attributes.Append(idAttribute); - - var versionAttribute = xmlDoc.CreateAttribute("Version"); - versionAttribute.Value = PackageDefinitions - .Where(p => string.Equals(p.GetMetadata("Name"), packageName, StringComparison.OrdinalIgnoreCase)) - .Select(p => p.GetMetadata("Version")).Single(); - packageElement.Attributes.Append(versionAttribute); - - packagesElement.AppendChild(packageElement); - } - - xmlDoc.AppendChild(packagesElement); - xmlDoc.Save(DestinationFilePath); - - return true; - } - } -} diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj deleted file mode 100644 index 8457d61d39..0000000000 --- a/build/tasks/RepoTasks.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - netcoreapp2.0 - 2.0.0-* - - - - diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks deleted file mode 100644 index 5de9828888..0000000000 --- a/build/tasks/RepoTasks.tasks +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj b/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj deleted file mode 100644 index 5315e09987..0000000000 --- a/src/Archive.AspNetCore.All/Archive.AspNetCore.All.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp2.0 - false - netcoreapp2.0 - - - - - - - - - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj deleted file mode 100644 index 4b702d4b73..0000000000 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - false - netcoreapp2.0 - aspnetcore - Microsoft.AspNetCore.All - false - - - - - - - - - - - - - - - diff --git a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets b/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets deleted file mode 100644 index a590cf01f1..0000000000 --- a/src/Microsoft.AspNetCore.All/build/PublishWithAspNetCoreTargetManifest.targets +++ /dev/null @@ -1,29 +0,0 @@ - - - true - - - - - - - - - - - - - $(TargetManifestFiles);@(AspNetCoreTargetManifestFiles) - - - diff --git a/src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets b/src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets deleted file mode 100644 index 0bed51f606..0000000000 --- a/src/Microsoft.AspNetCore.All/build/netcoreapp2.0/Microsoft.AspNetCore.All.targets +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Microsoft.AspNetCore.All/lib/netcoreapp2.0/_._ b/src/Microsoft.AspNetCore.All/lib/netcoreapp2.0/_._ deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj deleted file mode 100644 index e05f4dba2f..0000000000 --- a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netcoreapp2.0 - - - - - - diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj index 508e334cb7..f7d0f3ba81 100644 --- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj +++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj @@ -9,7 +9,21 @@ - + + + + + + + + + + + + + + + diff --git a/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj b/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj deleted file mode 100644 index 76f439edf3..0000000000 --- a/tools/Build.RuntimeStore.References/Build.RuntimeStore.References.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - false - netcoreapp2.0 - - - - - - - - - - - - - diff --git a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj b/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj deleted file mode 100644 index 284a46c5ab..0000000000 --- a/tools/Microsoft.AspNetCore.HostingStartup.Template/Microsoft.AspNetCore.HostingStartup.Template.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netcoreapp2.0 - Exe - - - - - - - - - $(RuntimeFrameworkVersion) - $(DepsOutputPath)\$(HostingStartupPackageName)\shared\Microsoft.NETCore.App\$(DepsRuntimeFrameworkVersion)\$(HostingStartupPackageName).deps.json - - - - - - diff --git a/tools/Microsoft.AspNetCore.HostingStartup.Template/Program.cs b/tools/Microsoft.AspNetCore.HostingStartup.Template/Program.cs deleted file mode 100644 index 8cd3c0026c..0000000000 --- a/tools/Microsoft.AspNetCore.HostingStartup.Template/Program.cs +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -public class Program -{ - public static void Main() { } -} \ No newline at end of file diff --git a/tools/TrimDeps/Program.cs b/tools/TrimDeps/Program.cs deleted file mode 100644 index f318230425..0000000000 --- a/tools/TrimDeps/Program.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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.IO; -using System.Linq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -public class Program -{ - public static void Main(string[] args) - { - Console.WriteLine("Trimming main library from " +args[0]); - ChangeEntryPointLibraryName(args[0]); - } - - private static void ChangeEntryPointLibraryName(string depsFile) - { - JToken deps; - using (var file = File.OpenText(depsFile)) - using (JsonTextReader reader = new JsonTextReader(file)) - { - deps = JObject.ReadFrom(reader); - } - - foreach (JProperty target in deps["targets"]) - { - var targetLibrary = target.Value.Children().FirstOrDefault(); - if (targetLibrary == null) - { - continue; - } - - targetLibrary.Remove(); - } - - var library = deps["libraries"].Children().First(); - library.Remove(); - - using (var file = File.CreateText(depsFile)) - using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented }) - { - deps.WriteTo(writer); - } - } -} diff --git a/tools/TrimDeps/TrimDeps.csproj b/tools/TrimDeps/TrimDeps.csproj deleted file mode 100644 index 7a4e82dded..0000000000 --- a/tools/TrimDeps/TrimDeps.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp2.0 - Exe - - - - - - - diff --git a/tools/docker/debian.8/Dockerfile b/tools/docker/debian.8/Dockerfile deleted file mode 100644 index 0c032b9d7f..0000000000 --- a/tools/docker/debian.8/Dockerfile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM debian:jessie - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - wget && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools/docker/rhel.7/Dockerfile b/tools/docker/rhel.7/Dockerfile deleted file mode 100644 index 73247d2809..0000000000 --- a/tools/docker/rhel.7/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM microsoft/dotnet-buildtools-prereqs:rhel-7-rpmpkg-c982313-20174116044113 - -# Install from sudo main package TODO This package needs to be mirrored -RUN yum install -y https://www.sudo.ws/sudo/dist/packages/RHEL/7/sudo-1.8.20-3.el7.x86_64.rpm \ - && yum clean all - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g root -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permssions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools/docker/ubuntu.14.04/Dockerfile b/tools/docker/ubuntu.14.04/Dockerfile deleted file mode 100644 index f039506971..0000000000 --- a/tools/docker/ubuntu.14.04/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:14.04 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo \ - libunwind8 \ - libkrb5-3 \ - libicu52 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - lldb-3.6 \ - wget && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code diff --git a/tools/docker/ubuntu.16.04/Dockerfile b/tools/docker/ubuntu.16.04/Dockerfile deleted file mode 100644 index 79e76f0703..0000000000 --- a/tools/docker/ubuntu.16.04/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -# - -FROM ubuntu:16.04 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN apt-get update && \ - apt-get install -y cmake \ - make \ - llvm-3.5 \ - clang-3.5 \ - git \ - curl \ - tar \ - sudo \ - debhelper \ - build-essential \ - devscripts \ - libunwind8 \ - libkrb5-3 \ - libicu55 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.6 \ - wget && \ - apt-get clean - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code \ No newline at end of file diff --git a/tools/docker/ubuntu.16.10/Dockerfile b/tools/docker/ubuntu.16.10/Dockerfile deleted file mode 100644 index c57bd4c3ff..0000000000 --- a/tools/docker/ubuntu.16.10/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (c) .NET Foundation. All rights reserved. -# Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:16.10 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo \ - libunwind8 \ - libkrb5-3 \ - libicu57 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.5 \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 \ - wget && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -WORKDIR /opt/code \ No newline at end of file diff --git a/tools/dotnet-deb-tool-consumer/NuGet.config b/tools/dotnet-deb-tool-consumer/NuGet.config deleted file mode 100644 index 60d3088e1f..0000000000 --- a/tools/dotnet-deb-tool-consumer/NuGet.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj b/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj deleted file mode 100644 index db3987ea48..0000000000 --- a/tools/dotnet-deb-tool-consumer/dotnet-deb-tool-consumer.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - netcoreapp1.0 - - - - - - - diff --git a/tools/packaging/changelog b/tools/packaging/changelog deleted file mode 100644 index f28d88ed10..0000000000 --- a/tools/packaging/changelog +++ /dev/null @@ -1,2 +0,0 @@ -* DATE MAINTAINER_NAME - PACKAGE_VERSION-PACKAGE_REVISION -- \ No newline at end of file diff --git a/tools/packaging/hosting_debian_config.json b/tools/packaging/hosting_debian_config.json deleted file mode 100644 index a01cf5cafc..0000000000 --- a/tools/packaging/hosting_debian_config.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "maintainer_name": "Microsoft", - "maintainer_email": "nugetaspnet@microsoft.com", - - "package_name": "dotnet-hosting", - "install_root": "/usr/share/dotnet", - - "short_description": "Microsoft .NET Core 2.0.0 Linux Server Hosting", - "long_description": "Microsoft .NET Core 2.0.0 Linux Server Hosting enables hosting of ASP.NET Core applications and contains the ASP.NET Core Runtime Package Store and .NET Core Runtime. 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/aspnet/home). We happily accept issues and PRs.", - "homepage": "https://www.asp.net/", - - "release":{ - "package_version":"0.0.0.0", - "package_revision":"1", - "urgency" : "low", - "changelog_message" : "" - }, - - "control": { - "priority":"standard", - "section":"devel", - "architecture":"any" - }, - - "copyright": "Microsoft", - "license": { - "type": "Apache-2.0", - "full_text": "Copyright (c) .NET Foundation. All rights reserved.\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use\nthese files except in compliance with the License. You may obtain a copy of the\nLicense at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License." - }, - - "debian_dependencies": { - "dotnet-runtime-DOTNET_RUNTIME_VERSION": {}, - "aspnetcore-store-ASPNETCORE_STORE_VERSION": {} - } -} \ No newline at end of file diff --git a/tools/packaging/store_debian_config.json b/tools/packaging/store_debian_config.json deleted file mode 100644 index dfd9d9b499..0000000000 --- a/tools/packaging/store_debian_config.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "maintainer_name": "Microsoft", - "maintainer_email": "nugetaspnet@microsoft.com", - - "package_name": "aspnetcore-store", - "install_root": "/usr/share/dotnet", - - "short_description": "Microsoft ASP.NET Core 2.0.0 Runtime Package Store", - "long_description": "Runtime package store for Microsoft ASP.NET Core. 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/aspnet/home). We happily accept issues and PRs.", - "homepage": "https://www.asp.net/", - - "release":{ - "package_version":"0.0.0.0", - "package_revision":"1", - "urgency" : "low", - "changelog_message" : "" - }, - - "control": { - "priority":"standard", - "section":"devel", - "architecture":"any" - }, - - "copyright": "Microsoft", - "license": { - "type": "Apache-2.0", - "full_text": "Copyright (c) .NET Foundation. All rights reserved.\n\nLicensed under the Apache License, Version 2.0 (the \"License\"); you may not use\nthese files except in compliance with the License. You may obtain a copy of the\nLicense at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed\nunder the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR\nCONDITIONS OF ANY KIND, either express or implied. See the License for the\nspecific language governing permissions and limitations under the License." - } -} \ No newline at end of file diff --git a/tools/scripts/GetSharedFrameworkVersion.ps1 b/tools/scripts/GetSharedFrameworkVersion.ps1 deleted file mode 100644 index 37772625fe..0000000000 --- a/tools/scripts/GetSharedFrameworkVersion.ps1 +++ /dev/null @@ -1,6 +0,0 @@ -$infoOutput = dotnet --info -$versions = $infoOutput | Select-String -Pattern "version" -$FXVersionRaw = $versions | Select-Object -Last 1 -$FXVersionString = $FXVersionRaw.ToString() -$FXVersion = $FXVersionString.SubString($FXVersionString.IndexOf(':') + 1).Trim() -Write-Host $FXVersion diff --git a/tools/scripts/GetSharedFrameworkVersion.sh b/tools/scripts/GetSharedFrameworkVersion.sh deleted file mode 100755 index 1b6e0b4bb0..0000000000 --- a/tools/scripts/GetSharedFrameworkVersion.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -dotnet --info | grep -i version | tail -1 | cut -f 2 -d ":" | tr -d ' ' \ No newline at end of file diff --git a/tools/scripts/TestInstallers.sh b/tools/scripts/TestInstallers.sh deleted file mode 100755 index dbda428443..0000000000 --- a/tools/scripts/TestInstallers.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env bash -set -e -set -o pipefail - -artifactsDir="artifacts/" -installersDir=$artifactsDir"installers/" -dotnetInstallersDir=$artifactsDir"dotnetInstallers/" -installerTestDir=$artifactsDir"installerTest/" - -# clean up test directory -if [ -d $installerTestDir ]; then - rm -r $installerTestDir -fi -mkdir $installerTestDir - -# copy dotnet installers -cp $dotnetInstallersDir*$DotnetInstallerSuffix $installerTestDir - -# copy store and hosting installers -cp $installersDir$StoreInstallerFile $installerTestDir -cp $installersDir$HostingInstallerFile $installerTestDir - -# test store install -(cd $installerTestDir && $InstallCommand $StoreInstallerFile) - -if [ ! -d $InstallRoot"additionalDeps" ]; then - echo $InstallRoot"additionalDeps missing after installing the runtime store." - exit 1 -fi -if [ ! -d $InstallRoot"store" ]; then - echo $InstallRoot"store missing after installing the runtime store." - exit 1 -fi - -# test store uninstall -$UninstallCommand $StoreInstallerPackageName - -if [ -d $InstallRoot"additionalDeps" ]; then - echo $InstallRoot"additionalDeps remains after uninstalling the runtime store." - exit 1 -fi -if [ -d $InstallRoot"store" ]; then - echo $InstallRoot"store remains after uninstalling the runtime store." - exit 1 -fi - -# test hosting install -(cd $installerTestDir && $InstallCommand *$InstallerExtension) - -if [ ! -d $InstallRoot"additionalDeps" ]; then - echo $InstallRoot"additionalDeps missing after installing the hosting bundle." - exit 1 -fi -if [ ! -d $InstallRoot"shared" ]; then - echo $InstallRoot"shared missing after installing the hosting bundle." - exit 1 -fi -if [ ! -d $InstallRoot"store" ]; then - echo $InstallRoot"store missing after installing the hosting bundle." - exit 1 -fi - -# test hosting uninstall -$UninstallCommand $HostingInstallerPackageName - -if [ ! -d $InstallRoot"additionalDeps" ]; then - echo $InstallRoot"additionalDeps missing after installing the hosting bundle." - exit 1 -fi -if [ ! -d $InstallRoot"shared" ]; then - echo $InstallRoot"shared missing after installing the hosting bundle." - exit 1 -fi -if [ ! -d $InstallRoot"store" ]; then - echo $InstallRoot"store missing after installing the hosting bundle." - exit 1 -fi diff --git a/tools/scripts/zip2tgz.sh b/tools/scripts/zip2tgz.sh deleted file mode 100755 index 15a5cd2a12..0000000000 --- a/tools/scripts/zip2tgz.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -if [[ $# < 2 ]]; then - echo "Usage: [src] [dest]" - exit 1 -fi - -function realpath() { - [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}" -} - -src="$(realpath $1)" -dest="$(realpath $2)" - -echo "Converting:" -echo " - $src" -echo " => $dest" - -tmp="$(mktemp -d)" -echo "Using temp dir $tmp" -function cleanup() { - echo "Cleaning up" - rm -rf $tmp - echo "Done" -} -trap cleanup INT TERM EXIT -set -e - -unzip -q $src -d $tmp -chmod -R +r $tmp -tar -c -z -f $dest -C $tmp .