diff --git a/eng/Versions.props b/eng/Versions.props
index 8a42be504..cffeabf1f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -98,11 +98,6 @@
$(MicrosoftDotNetCommonItemTemplates30PackageVersion)
1.0.2-beta4.20105.2
3.0.1
-
- 1.6.0
- 1.0.2-beta4
- $(MicrosoftDotNetCommonItemTemplates22PackageVersion)
- 2.2.8
1.5.3
1.0.2-beta3
diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index 44174a784..f42f3cc32 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -15,7 +15,6 @@
$(SharedFrameworkName)
Microsoft .NET Core 3.1 Templates $(CliBrandingVersion)
Microsoft .NET Core 3.0 Templates $(CliBrandingVersion)
- Microsoft .NET Core 2.2 Templates $(CliBrandingVersion)
Microsoft .NET Core 2.1 Templates $(CliBrandingVersion)
diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 709da201f..7c2713bc9 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -18,14 +18,6 @@
-
-
-
-
-
-
@@ -57,15 +49,6 @@
-
-
-
-
-
-
-
-
-
@@ -90,13 +73,6 @@
[%(PackageVersion)]
-
-
- %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg
- $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())
- [%(PackageVersion)]
-
-
%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg
@@ -109,32 +85,27 @@
-
@@ -151,7 +122,7 @@
+ DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor21MSI" />
@@ -177,13 +148,6 @@
DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30InstallPath)"/>
-
-
-
-
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 771478685..781fa0b8a 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -4,7 +4,6 @@
$(BaseOutputPath)$(Configuration)\dotnet-internal\
$(BaseOutputPath)$(Configuration)\templates-3.1\
$(BaseOutputPath)$(Configuration)\templates-3.0\
- $(BaseOutputPath)$(Configuration)\templates-2.2\
$(BaseOutputPath)$(Configuration)\templates-2.1\
$(IntermediateOutputPath)downloads\
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index c73470943..6f6e8463d 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -41,7 +41,6 @@
Dotnet_CLI
$(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)
$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)
- $(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)
$(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)
$(ArtifactsShippingPackagesDir)dotnet-sdkplaceholder-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)
NetCore_SdkPlaceholder
@@ -60,7 +59,7 @@
DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo">
-
+
-
-
-
-
@@ -214,14 +208,6 @@
$(Templates30InstallerUpgradeCode)
NetCore_Templates_3.0
-
- $(Templates22LayoutPath.TrimEnd('\'))
- $(Templates22MSIInstallerFile)
- $(BundledTemplates22BrandName)
- $(BundledTemplates22MsiVersion)
- $(Templates22InstallerUpgradeCode)
- NetCore_Templates_2.2
-
$(Templates21LayoutPath.TrimEnd('\'))
$(Templates21MSIInstallerFile)
@@ -345,11 +331,6 @@
$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg
$(BundledTemplates30MajorMinorVersion)
-
- $(Templates22MSIInstallerFile)
- $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(FullNugetVersion).nupkg
- $(BundledTemplates22MajorMinorVersion)
-
$(Templates21MSIInstallerFile)
$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(FullNugetVersion).nupkg
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index c6f771010..0d5eb9596 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -177,7 +177,6 @@
-