From 49ad1e8dd53623ba33a143663a8781cca1b57f2d Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 17 Jul 2019 23:18:41 +0000 Subject: [PATCH 1/9] Adding 2.1 and 2.2 Templates MSIs, part 1 --- eng/Versions.props | 24 ++++- src/redist/targets/BundledTemplates.targets | 109 +++++++++++++++----- src/redist/targets/GenerateLayout.targets | 8 +- src/redist/targets/GenerateMSIs.targets | 10 +- 4 files changed, 117 insertions(+), 34 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8df8dd9a1..143e8dbcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,11 +36,7 @@ 3.0.100-preview8.19367.2 - 2.0.0-preview8.19365.2 - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 1.0.2-beta4.19155.2 0.2.0 - 1.6.1 @@ -63,6 +59,26 @@ 3.0.0-preview8-27917-01 $(MicrosoftWindowsDesktopAppPackageVersion) + + + 1.6.1 + 2.0.0-preview8.19365.2 + $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + 1.0.2-beta4.19155.2 + $(AspNetCoreVersion) + + 1.6.0 + 1.0.2-beta4 + $(MicrosoftDotNetCommonItemTemplates22PackageVersion) + 1.0.2-beta4.19155.2 + 2.2.6 + + 1.5.3 + 1.0.2-beta3 + $(MicrosoftDotNetCommonItemTemplates21PackageVersion) + 1.0.2-beta4-20181009-2100240 + 2.1.12 + 2.2.0-beta.19072.10 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index fe161fe49..ddd429665 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -2,40 +2,89 @@ - $(MicrosoftNETCoreAppPackageVersion.IndexOf('-')) - $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreAppPackageVersion.Substring(0, $(MicrosoftNETCoreAppVersionPreReleaseSeparator))) - $(MicrosoftNETCoreAppMajorMinorPatchVersion) - $(BundledTemplatesVersion)-$(VersionSuffix) + $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor30Templates) + $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) + $(AspNetCore30VersionMajorMinorPatchVersion) + $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) + $(BundledTemplates30Version)-$(VersionSuffix) + + $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor22Templates) + $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) + $(AspNetCore22VersionMajorMinorPatchVersion) + $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) + $(BundledTemplates22Version)-$(VersionSuffix) + + $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor21Templates) + $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) + $(AspNetCore21VersionMajorMinorPatchVersion) + $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) + $(BundledTemplates21Version)-$(VersionSuffix) - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + %(Identity)/%(Version)/%(Identity).%(Version).nupkg $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - + + + + %(Identity)/%(Version)/%(Identity).%(Version).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + + + + + + %(Identity)/%(Version)/%(Identity).%(Version).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + + + @@ -43,13 +92,27 @@ + DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates30Version)"/> - - + + + + + + + + + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 8a66ee6f3..9129e7f5f 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -2,7 +2,9 @@ $(BaseOutputPath)$(Configuration)\dotnet\ $(BaseOutputPath)$(Configuration)\dotnet-internal\ - $(BaseOutputPath)$(Configuration)\dotnet-templates\ + $(BaseOutputPath)$(Configuration)\templates-3.0\ + $(BaseOutputPath)$(Configuration)\templates-2.2\ + $(BaseOutputPath)$(Configuration)\templates-2.1\ $(IntermediateOutputPath)downloads\ @@ -416,7 +418,9 @@ GenerateBundledVersions; LayoutRuntimeGraph; LayoutTemplates; - LayoutTemplatesForMSI; + LayoutTemplatesFor30MSI; + LayoutTemplatesFor22MSI; + LayoutTemplatesFor21MSI; LayoutBundledTools; RetargetTools; CrossgenLayout; diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 1a33cabbb..b8a5fa98f 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -130,18 +130,18 @@ From 4de1b875e52cf8bf9f2002d0662f2725a3915efd Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 22 Jul 2019 15:55:23 +0000 Subject: [PATCH 2/9] Adding 2.1 and 2.2 Templates MSIs, part 2 --- eng/Versions.props | 14 +- src/redist/redist.csproj | 2 + src/redist/targets/Bundled21Templates.targets | 51 +++++ src/redist/targets/Bundled22Templates.targets | 50 +++++ src/redist/targets/BundledTemplates.targets | 81 +------- src/redist/targets/GenerateMSIs.targets | 188 ++++++++++++------ .../targets/GetRuntimeInformation.targets | 1 - src/redist/targets/Signing.targets | 11 +- .../VS.Redist.Common.NetCore.Templates.nuspec | 7 +- .../VS.Redist.Common.NetCore.Toolset.nuspec | 6 +- .../clisdk/VS.Tools.Net.Core.SDK.nuspec | 6 +- .../windows/clisdk/generatenupkg.ps1 | 8 +- .../windows/clisdk/generatetemplatesmsi.ps1 | 6 +- .../packaging/windows/clisdk/templates.wxs | 7 +- 14 files changed, 271 insertions(+), 167 deletions(-) create mode 100644 src/redist/targets/Bundled21Templates.targets create mode 100644 src/redist/targets/Bundled22Templates.targets diff --git a/eng/Versions.props b/eng/Versions.props index 143e8dbcd..a24362758 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,14 +14,6 @@ 3.0.100-preview8.19367.9 - - - 4.8.0-preview8.19359.1 - - - - 3.0.0-preview8.19359.5 - 3.0.0-preview8.19367.2 @@ -61,7 +53,11 @@ - 1.6.1 + + 4.8.0-preview8.19359.1 + + 3.0.0-preview8.19359.5 + 1.6.1 2.0.0-preview8.19365.2 $(MicrosoftDotNetCommonItemTemplatesPackageVersion) 1.0.2-beta4.19155.2 diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index e9f84e078..a65627053 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -26,6 +26,8 @@ + + diff --git a/src/redist/targets/Bundled21Templates.targets b/src/redist/targets/Bundled21Templates.targets new file mode 100644 index 000000000..30a9172ab --- /dev/null +++ b/src/redist/targets/Bundled21Templates.targets @@ -0,0 +1,51 @@ + + + + $(AspNetCorePackageVersionFor21Templates) + $(AspNetCorePackageVersionFor21Templates).$(GitCommitCount) + $(AspNetCorePackageVersionFor21Templates)-$(VersionSuffix) + $([MSBuild]::Add($(BundledTemplates21InstallPath.IndexOf('.')), 1)) + $(BundledTemplates21InstallPath.IndexOf('.', $(Templates21VersionPatchSeparatorIndex))) + $(BundledTemplates21InstallPath.Substring(0, $(Templates21VersionPatchSeparatorIndex))) + + + + + + + + + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + + + + + + + + + + + + + + diff --git a/src/redist/targets/Bundled22Templates.targets b/src/redist/targets/Bundled22Templates.targets new file mode 100644 index 000000000..83359e6a3 --- /dev/null +++ b/src/redist/targets/Bundled22Templates.targets @@ -0,0 +1,50 @@ + + + + $(AspNetCorePackageVersionFor22Templates) + $(AspNetCorePackageVersionFor22Templates).$(GitCommitCount) + $(AspNetCorePackageVersionFor22Templates)-$(VersionSuffix) + $([MSBuild]::Add($(BundledTemplates22InstallPath.IndexOf('.')), 1)) + $(BundledTemplates22InstallPath.IndexOf('.', $(Templates22VersionPatchSeparatorIndex))) + $(BundledTemplates22InstallPath.Substring(0, $(Templates22VersionPatchSeparatorIndex))) + + + + + + + + + + + + + + + + + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + + + + + + + + + + + + + diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index ddd429665..a40942dfc 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,27 +1,16 @@ - $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) - $(AspNetCore30VersionMajorMinorPatchVersion) $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore30VersionMajorMinorPatchVersion) $(BundledTemplates30Version)-$(VersionSuffix) - - $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor22Templates) - $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) - $(AspNetCore22VersionMajorMinorPatchVersion) - $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) - $(BundledTemplates22Version)-$(VersionSuffix) - - $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) - $(AspNetCorePackageVersionFor21Templates) - $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) - $(AspNetCore21VersionMajorMinorPatchVersion) - $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) - $(BundledTemplates21Version)-$(VersionSuffix) + $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) + $(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex))) + $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) @@ -36,83 +25,33 @@ - - - - - - - - - - - - - - - - - - - - - - - + %(Identity)/%(Version)/%(Identity).%(Version).nupkg $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - - %(Identity)/%(Version)/%(Identity).%(Version).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - - - - - %(Identity)/%(Version)/%(Identity).%(Version).nupkg - $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) - - + DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion"> - + DependsOnTargets="SetupBundledComponents;Calculate30TemplatesVersion" + Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> - - - - - - - - diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index b8a5fa98f..f84d062ee 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -16,14 +16,11 @@ $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatemsi.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/stablefileidforapphosttransform.xslt - $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatetemplatesmsi.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatebundle.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatenupkg.ps1 $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Toolset.$(Architecture).$(FullNugetVersion).nupkg - $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Architecture).$(FullNugetVersion).nupkg $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec $(ArtifactsNonShippingPackagesDir)VS.Tools.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg @@ -37,11 +34,12 @@ - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionTemplates)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)t$(Architecture)-1.cab - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates30Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates22Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates21Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) $(ProductBandCombinedHostHostFxrFrameworkSdkName) - + - + - + + PropertyName="Templates30InstallerUpgradeCode" /> + + + + + + + + @@ -111,11 +119,11 @@ Condition=" '$(OS)' == 'Windows_NT' " Inputs="$(SdkInternalLayoutPath)**/*; $(SdkGenerateMsiPowershellScript)" - Outputs="$(SdkMSIInstallerFile)"> + Outputs="$(SdkMsiInstallerFile)"> - + + + + $(MSBuildThisFileDirectory)packaging/windows/clisdk/generatetemplatesmsi.ps1 + + + + + $(Templates30LayoutPath.TrimEnd('\')) + $(Templates30MsiInstallerFile) + Microsoft .NET Core 3.0 Templates + $(BundledTemplates30MsiVersion) + $(BundledTemplates30Version) + $(Templates30InstallerUpgradeCode) + + + $(Templates22LayoutPath.TrimEnd('\')) + $(Templates22MsiInstallerFile) + Microsoft .NET Core 2.2 Templates + $(BundledTemplates22MsiVersion) + $(BundledTemplates22Version) + $(Templates22InstallerUpgradeCode) + + + $(Templates21LayoutPath.TrimEnd('\')) + $(Templates21MsiInstallerFile) + Microsoft .NET Core 2.1 Templates + $(BundledTemplates21MsiVersion) + $(BundledTemplates21Version) + $(Templates21InstallerUpgradeCode) + + + + + Outputs="$(CombinedFrameworkSdkHostMsiInstallerFile)"> + '$(SdkMsiCabFile)'" /> - + Outputs="@(TemplatesNupkgComponent->'%(NupkgFile)')"> + '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^ + '@(TemplatesNupkgComponent->'%(IDSuffix)')'" /> + + + + + $(MSBuildThisFileDirectory)packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec + + + + + $(Templates30MsiInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates30MajorMinorVersion).$(BundledTemplates30Version).nupkg + $(BundledTemplates30Version) + $(Architecture).$(Templates30MajorMinorVersion) + + + $(Templates22MsiInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates22MajorMinorVersion).$(BundledTemplates22Version).nupkg + $(BundledTemplates22Version) + $(Architecture).$(Templates22MajorMinorVersion) + + + $(Templates21MsiInstallerFile) + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates21MajorMinorVersion).$(BundledTemplates21Version).nupkg + $(BundledTemplates21Version) + $(Architecture).$(Templates21MajorMinorVersion) + + + '$(ArtifactsDir)' ^ + '$(RedistLayoutPath.TrimEnd('\'))' ^ + '$(FullNugetVersion)' ^ + '$(VSToolsNuspecFile)' ^ + '$(VSToolsNupkgFile)' ^ + '$(Architecture)'" /> + '$(ArtifactsDir)' ^ + '$(SdkResolverLayoutPath.TrimEnd('\'))' ^ + '$(FullNugetVersion)' ^ + '$(VSToolsResolverNuspecFile)' ^ + '$(VSToolsResolverNupkgFile)'" /> dotnet-sdk $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid) - $(ArtifactNameTemplates)-$(SdkVersion)-$(ProductMonikerRid) dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid) $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid) - + + + + + + + - + + + + + + + + + + - %(Identity)/%(Version)/%(Identity).%(Version).nupkg + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] - + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + + + + %(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg + $(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower()) + [%(PackageVersion)] + + + + + + + + + + @@ -54,4 +104,18 @@ + + + + + + + + diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 9129e7f5f..f7937d6fb 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -418,9 +418,6 @@ GenerateBundledVersions; LayoutRuntimeGraph; LayoutTemplates; - LayoutTemplatesFor30MSI; - LayoutTemplatesFor22MSI; - LayoutTemplatesFor21MSI; LayoutBundledTools; RetargetTools; CrossgenLayout; diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index f84d062ee..87962f739 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -34,12 +34,12 @@ - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab - $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates30Version)-$(ProductMonikerRid)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates22Version)-$(ProductMonikerRid)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates21Version)-$(ProductMonikerRid)$(InstallerExtension) - $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)d$(Architecture)-1.cab + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates30Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates22Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameTemplates)-$(BundledTemplates21Version)-$(ProductMonikerRid)$(InstallerExtension) + $(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension) $(ProductBandCombinedHostHostFxrFrameworkSdkName) - + - + - + - + - + @@ -119,11 +119,11 @@ Condition=" '$(OS)' == 'Windows_NT' " Inputs="$(SdkInternalLayoutPath)**/*; $(SdkGenerateMsiPowershellScript)" - Outputs="$(SdkMsiInstallerFile)"> + Outputs="$(SdkMSIInstallerFile)"> + Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')"> $(Templates30LayoutPath.TrimEnd('\')) - $(Templates30MsiInstallerFile) + $(Templates30MSIInstallerFile) Microsoft .NET Core 3.0 Templates $(BundledTemplates30MsiVersion) $(BundledTemplates30Version) @@ -171,7 +171,7 @@ $(Templates22LayoutPath.TrimEnd('\')) - $(Templates22MsiInstallerFile) + $(Templates22MSIInstallerFile) Microsoft .NET Core 2.2 Templates $(BundledTemplates22MsiVersion) $(BundledTemplates22Version) @@ -179,7 +179,7 @@ $(Templates21LayoutPath.TrimEnd('\')) - $(Templates21MsiInstallerFile) + $(Templates21MSIInstallerFile) Microsoft .NET Core 2.1 Templates $(BundledTemplates21MsiVersion) $(BundledTemplates21Version) @@ -191,15 +191,15 @@ + Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)"> + '$(SdkMSICabFile)'" /> '%(MSIInstallerFile)'); $(TemplatesInstallerNuspecFile); $(GenerateNupkgPowershellScript)" Outputs="@(TemplatesNupkgComponent->'%(NupkgFile)')"> - $(Templates30MsiInstallerFile) + $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates30MajorMinorVersion).$(BundledTemplates30Version).nupkg $(BundledTemplates30Version) $(Architecture).$(Templates30MajorMinorVersion) - $(Templates22MsiInstallerFile) + $(Templates22MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates22MajorMinorVersion).$(BundledTemplates22Version).nupkg $(BundledTemplates22Version) $(Architecture).$(Templates22MajorMinorVersion) - $(Templates21MsiInstallerFile) + $(Templates21MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates21MajorMinorVersion).$(BundledTemplates21Version).nupkg $(BundledTemplates21Version) $(Architecture).$(Templates21MajorMinorVersion) From f31451cbc0676c3f2bb9793f097d38541e96a95f Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 22 Jul 2019 22:26:51 +0000 Subject: [PATCH 4/9] Minor updates to variable names --- src/redist/targets/BundledTemplates.targets | 24 ++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 522073b01..00b3122e1 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -1,5 +1,5 @@ - $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) @@ -80,16 +80,20 @@ - - + + + + + + + DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"> @@ -99,23 +103,23 @@ - - + From 14ef11f03034860d2cd1ca94aa353c22ead405b7 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Mon, 22 Jul 2019 22:31:48 +0000 Subject: [PATCH 5/9] Formatting... --- src/redist/targets/BundledTemplates.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 00b3122e1..8905b57a6 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -110,15 +110,15 @@ + DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions" + Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> + DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions" + Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))"> From aacd4f617913b58109685942065493f6625a6af7 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 24 Jul 2019 00:18:21 +0000 Subject: [PATCH 6/9] Updating 3.0 template variables. --- eng/Versions.props | 6 +++--- src/redist/targets/BundledTemplates.targets | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 66479a34b..9e7cd93c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,9 +57,9 @@ 4.8.0-preview8.19359.1 3.0.0-preview8.19359.5 - 1.6.1 - 2.0.0-preview8.19365.2 - $(MicrosoftDotNetCommonItemTemplatesPackageVersion) + 1.6.1 + 2.0.0-preview8.19365.2 + $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 1.0.2-beta4.19155.2 $(AspNetCoreVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 8905b57a6..96c769e1a 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + From b95848906ad74d051a25842a3a97d2cf4d8b12e3 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 24 Jul 2019 00:41:46 +0000 Subject: [PATCH 7/9] Fixing the 3.0 template conditional; adding a comment. --- src/redist/targets/BundledTemplates.targets | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 96c769e1a..582546552 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -5,9 +5,11 @@ $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) + $(AspNetCore30VersionMajorMinorPatchVersion) + + $(BundledTemplates30InstallPath)-$(VersionSuffix) $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) - $(AspNetCore30VersionMajorMinorPatchVersion) - $(BundledTemplates30Version)-$(VersionSuffix) + $(AspNetCore30VersionMajorMinorPatchVersion)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) $(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex))) $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) @@ -99,14 +101,14 @@ + DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates30InstallPath)"/> + DestinationFolder="$(Templates30LayoutPath)templates/$(BundledTemplates30InstallPath)"/> Date: Wed, 24 Jul 2019 03:32:47 +0000 Subject: [PATCH 8/9] Updates per code review. --- eng/Versions.props | 14 ++++-- src/redist/targets/BundledTemplates.targets | 51 ++++++++++++--------- src/redist/targets/GenerateMSIs.targets | 12 ++--- 3 files changed, 45 insertions(+), 32 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9e7cd93c1..03515ba32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,6 +14,14 @@ 3.0.100-preview8.19371.3 + + + 4.8.0-preview8.19359.1 + + + + 3.0.0-preview8.19359.5 + 3.0.0-preview8.19371.5 @@ -53,10 +61,8 @@ - - 4.8.0-preview8.19359.1 - - 3.0.0-preview8.19359.5 + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) 1.6.1 2.0.0-preview8.19365.2 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 582546552..caf7b6a62 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -5,28 +5,35 @@ $(AspNetCorePackageVersionFor30Templates.IndexOf('-')) $(AspNetCorePackageVersionFor30Templates) $(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator))) - $(AspNetCore30VersionMajorMinorPatchVersion) - - $(BundledTemplates30InstallPath)-$(VersionSuffix) - $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) $(AspNetCore30VersionMajorMinorPatchVersion)-$(VersionSuffix) + $(AspNetCore30VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore30VersionMajorMinorPatchVersion) + $(BundledTemplates30InstallPath)-$(VersionSuffix) $([MSBuild]::Add($(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.')), 1)) $(AspNetCore30VersionMajorMinorPatchVersion.IndexOf('.', $(Templates30VersionPatchSeparatorIndex))) - $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) + $(AspNetCore30VersionMajorMinorPatchVersion.Substring(0, $(Templates30VersionPatchSeparatorIndex))) - $(AspNetCorePackageVersionFor22Templates) - $(AspNetCorePackageVersionFor22Templates).$(GitCommitCount) - $(AspNetCorePackageVersionFor22Templates)-$(VersionSuffix) - $([MSBuild]::Add($(BundledTemplates22InstallPath.IndexOf('.')), 1)) - $(BundledTemplates22InstallPath.IndexOf('.', $(Templates22VersionPatchSeparatorIndex))) - $(BundledTemplates22InstallPath.Substring(0, $(Templates22VersionPatchSeparatorIndex))) + $(AspNetCorePackageVersionFor22Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor22Templates) + $(AspNetCorePackageVersionFor22Templates.Substring(0, $(AspNetCore22VersionPreReleaseSeparator))) + $(AspNetCore22VersionMajorMinorPatchVersion)-$(VersionSuffix) + $(AspNetCore22VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore22VersionMajorMinorPatchVersion) + $(BundledTemplates22InstallPath)-$(VersionSuffix) + $([MSBuild]::Add($(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.')), 1)) + $(AspNetCore22VersionMajorMinorPatchVersion.IndexOf('.', $(Templates22VersionPatchSeparatorIndex))) + $(AspNetCore22VersionMajorMinorPatchVersion.Substring(0, $(Templates22VersionPatchSeparatorIndex))) - $(AspNetCorePackageVersionFor21Templates) - $(AspNetCorePackageVersionFor21Templates).$(GitCommitCount) - $(AspNetCorePackageVersionFor21Templates)-$(VersionSuffix) - $([MSBuild]::Add($(BundledTemplates21InstallPath.IndexOf('.')), 1)) - $(BundledTemplates21InstallPath.IndexOf('.', $(Templates21VersionPatchSeparatorIndex))) - $(BundledTemplates21InstallPath.Substring(0, $(Templates21VersionPatchSeparatorIndex))) + $(AspNetCorePackageVersionFor21Templates.IndexOf('-')) + $(AspNetCorePackageVersionFor21Templates) + $(AspNetCorePackageVersionFor21Templates.Substring(0, $(AspNetCore21VersionPreReleaseSeparator))) + $(AspNetCore21VersionMajorMinorPatchVersion)-$(VersionSuffix) + $(AspNetCore21VersionMajorMinorPatchVersion).$(GitCommitCount) + $(AspNetCore21VersionMajorMinorPatchVersion) + $(BundledTemplates21InstallPath)-$(VersionSuffix) + $([MSBuild]::Add($(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.')), 1)) + $(AspNetCore21VersionMajorMinorPatchVersion.IndexOf('.', $(Templates21VersionPatchSeparatorIndex))) + $(AspNetCore21VersionMajorMinorPatchVersion.Substring(0, $(Templates21VersionPatchSeparatorIndex))) @@ -34,11 +41,11 @@ - - - - - + + + + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 87962f739..d94092fb9 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -269,21 +269,21 @@ $(Templates30MSIInstallerFile) - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates30MajorMinorVersion).$(BundledTemplates30Version).nupkg + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg $(BundledTemplates30Version) - $(Architecture).$(Templates30MajorMinorVersion) + $(Architecture).$(BundledTemplates30MajorMinorVersion) $(Templates22MSIInstallerFile) - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates22MajorMinorVersion).$(BundledTemplates22Version).nupkg + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg $(BundledTemplates22Version) - $(Architecture).$(Templates22MajorMinorVersion) + $(Architecture).$(BundledTemplates22MajorMinorVersion) $(Templates21MSIInstallerFile) - $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(Templates21MajorMinorVersion).$(BundledTemplates21Version).nupkg + $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg $(BundledTemplates21Version) - $(Architecture).$(Templates21MajorMinorVersion) + $(Architecture).$(BundledTemplates21MajorMinorVersion) From 67c7c446f98ea18f2006b69e1e01aa654bdd8fe6 Mon Sep 17 00:00:00 2001 From: jbeisner Date: Wed, 24 Jul 2019 16:08:11 +0000 Subject: [PATCH 9/9] Updates per code review --- src/redist/targets/Branding.targets | 3 +++ src/redist/targets/GenerateMSIs.targets | 20 ++++++++++--------- .../VS.Redist.Common.NetCore.Templates.nuspec | 6 +++--- .../VS.Redist.Common.NetCore.Toolset.nuspec | 6 +++--- .../clisdk/VS.Tools.Net.Core.SDK.nuspec | 6 +++--- .../windows/clisdk/generatenupkg.ps1 | 5 +++-- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets index 9f81239cd..e70d058c2 100644 --- a/src/redist/targets/Branding.targets +++ b/src/redist/targets/Branding.targets @@ -12,6 +12,9 @@ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion) Microsoft.NETCore.App $(SharedFrameworkName) + Microsoft .NET Core 3.0 Templates + Microsoft .NET Core 2.2 Templates + Microsoft .NET Core 2.1 Templates diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index d94092fb9..9fdb03b75 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -143,8 +143,8 @@ Outputs="@(TemplatesMsiComponent->'%(MSIInstallerFile)')"> $(Templates30LayoutPath.TrimEnd('\')) $(Templates30MSIInstallerFile) - Microsoft .NET Core 3.0 Templates + $(BundledTemplates30BrandName) $(BundledTemplates30MsiVersion) $(BundledTemplates30Version) $(Templates30InstallerUpgradeCode) @@ -172,7 +172,7 @@ $(Templates22LayoutPath.TrimEnd('\')) $(Templates22MSIInstallerFile) - Microsoft .NET Core 2.2 Templates + $(BundledTemplates22BrandName) $(BundledTemplates22MsiVersion) $(BundledTemplates22Version) $(Templates22InstallerUpgradeCode) @@ -180,7 +180,7 @@ $(Templates21LayoutPath.TrimEnd('\')) $(Templates21MSIInstallerFile) - Microsoft .NET Core 2.1 Templates + $(BundledTemplates21BrandName) $(BundledTemplates21MsiVersion) $(BundledTemplates21Version) $(Templates21InstallerUpgradeCode) @@ -241,6 +241,7 @@ '$(ToolsetInstallerNuspecFile)' ^ '$(ToolsetInstallerNupkgFile)' ^ '$(Architecture)' ^ + '$(MajorMinorVersion)' ^ '$(SdkMSICabFile)'" /> @@ -258,7 +259,8 @@ '@(TemplatesNupkgComponent->'%(Version)')' ^ '$(TemplatesInstallerNuspecFile)' ^ '@(TemplatesNupkgComponent->'%(NupkgFile)')' ^ - '@(TemplatesNupkgComponent->'%(IDSuffix)')'" /> + '$(Architecture)' ^ + '@(TemplatesNupkgComponent->'%(MajorMinorVersion)')'" /> @@ -271,19 +273,19 @@ $(Templates30MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(BundledTemplates30Version).nupkg $(BundledTemplates30Version) - $(Architecture).$(BundledTemplates30MajorMinorVersion) + $(BundledTemplates30MajorMinorVersion) $(Templates22MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates22MajorMinorVersion).$(BundledTemplates22Version).nupkg $(BundledTemplates22Version) - $(Architecture).$(BundledTemplates22MajorMinorVersion) + $(BundledTemplates22MajorMinorVersion) $(Templates21MSIInstallerFile) $(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates21MajorMinorVersion).$(BundledTemplates21Version).nupkg $(BundledTemplates21Version) - $(Architecture).$(BundledTemplates21MajorMinorVersion) + $(BundledTemplates21MajorMinorVersion) diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec index acf7fe532..b6bcf5915 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Templates.nuspec @@ -1,15 +1,15 @@  - VS.Redist.Common.NetCore.Templates.$DATA$ + VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$ 1.0.0 - VS.Redist.Common.NetCore.Templates.$DATA$ + VS.Redist.Common.NetCore.Templates.$ARCH$.$MAJOR_MINOR$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm https://github.com/dotnet/core-sdk true - .NET Core $DATA$ Templates Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + .NET Core $MAJOR_MINOR$ Templates Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec index 8915aac6e..1c71d7a34 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Redist.Common.NetCore.Toolset.nuspec @@ -1,15 +1,15 @@  - VS.Redist.Common.NetCore.Toolset.$DATA$ + VS.Redist.Common.NetCore.Toolset.$ARCH$ 1.0.0 - VS.Redist.Common.NetCore.Toolset.$DATA$ + VS.Redist.Common.NetCore.Toolset.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm https://github.com/dotnet/core-sdk true - .NET Core SDK Toolset ($DATA$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption + .NET Core $MAJOR_MINOR$ SDK Toolset ($ARCH$) Windows Installer MSI as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. diff --git a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec index 5b93186c9..b986d3440 100644 --- a/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec +++ b/src/redist/targets/packaging/windows/clisdk/VS.Tools.Net.Core.SDK.nuspec @@ -1,15 +1,15 @@  - VS.Tools.Net.Core.SDK.$DATA$ + VS.Tools.Net.Core.SDK.$ARCH$ 1.0.0 - VS.Tools.Net.Core.SDK.$DATA$ + VS.Tools.Net.Core.SDK.$ARCH$ Microsoft Microsoft https://www.microsoft.com/net/dotnet_library_license.htm https://github.com/dotnet/core-sdk true - .NET Core SDK ($DATA$) as a .nupkg for internal Visual Studio build consumption + .NET Core SDK ($ARCH$) as a .nupkg for internal Visual Studio build consumption © Microsoft Corporation. All rights reserved. diff --git a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 index d54154225..9fda65872 100644 --- a/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 +++ b/src/redist/targets/packaging/windows/clisdk/generatenupkg.ps1 @@ -7,7 +7,8 @@ param( [Parameter(Mandatory=$true)][string]$NugetVersion, [Parameter(Mandatory=$true)][string]$NuspecFile, [Parameter(Mandatory=$true)][string]$NupkgFile, - [Parameter(Mandatory=$false)][string]$AdditionalData, + [Parameter(Mandatory=$false)][string]$Architecture, + [Parameter(Mandatory=$false)][string]$MmVersion, [Parameter(Mandatory=$false)][string]$CabPath ) @@ -33,5 +34,5 @@ if (Test-Path $NupkgFile) { Remove-Item -Force $NupkgFile } -& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;DATA=$AdditionalData +& $NuGetExe pack $NuspecFile -Version $NugetVersion -OutputDirectory $OutputDirectory -NoDefaultExcludes -NoPackageAnalysis -Properties PAYLOAD_FILES=$ContentPath`;DOTNET_CAB_FILE=$CabPath`;ARCH=$Architecture`;MAJOR_MINOR=$MmVersion Exit $LastExitCode