mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade (#8596)

Browse source 
[release/5.0.1xx-rc2] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.Cli.CommandLine: from 1.0.0-preview.19208.1 to 1.0.0-preview.19208.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-20457-02 to 1.1.0-beta-20464-02 (parent: Microsoft.DotNet.Arcade.Sdk)

 - Update create light/light command package drop task

 - Update create light/light command package drop task
This commit is contained in:
dotnet-maestro[bot] 2020-09-16 19:19:30 +00:00 • committed by GitHub
parent 739806aa77
commit d240f3cfd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
eng/Version.Details.xml
View file

@ -126,7 +126,7 @@
<Sha>5eaf25677df20ce322acd08478ccdaddd87f1a52</Sha> <Sha>5eaf25677df20ce322acd08478ccdaddd87f1a52</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk"> <Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri> <Uri>https://github.com/dotnet/cliCommandLineParser</Uri>
<Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha> <Sha>0e89c2116ad28e404ba56c14d1c3f938caa25a01</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0"> <Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@ -140,21 +140,21 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20464.13"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20465.7">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha> <Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20464.13"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20465.7">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bd918c64b786bdba42e895e4cb93603e5a2ca608</Sha> <Sha>fa0486ddb04a76341d822903c8977fb9fa088d1e</Sha>
</Dependency> </Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1"> <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha> <Sha>639aeb4d76c8b1a6226bf7c4edb34fbdae30e6e1</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20457-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-20464-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri> <Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>e9d917c21e38e274a413a207d9e84eb80382b56f</Sha> <Sha>8a3edd1902dbfe3adba65f22e3bb7aa2cc73e97f</Sha>
</Dependency> </Dependency>
<Dependency Name="XliffTasks" Version="1.0.0-beta.20420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk"> <Dependency Name="XliffTasks" Version="1.0.0-beta.20420.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri> <Uri>https://github.com/dotnet/xliff-tasks</Uri>

2
eng/Versions.props
View file

@ -17,7 +17,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20464.13</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20465.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

2
global.json
View file

@ -8,6 +8,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20464.13" "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20465.7"
} }
} }

44
src/redist/targets/GenerateMSIs.targets
View file

@ -201,19 +201,14 @@
</ItemGroup> </ItemGroup>
<CreateLightCommandPackageDrop <CreateLightCommandPackageDrop
LightCommandWorkingDir="$(LightCommandObjDir)" LightCommandWorkingDir="$(LightCommandObjDir)"
OutputFolder="$(LightCommandPackagesDir)"
NoLogo="true" NoLogo="true"
Cultures="en-us" Cultures="en-us"
Out="$(SdkMSIInstallerFile)" InstallerFile="$(SdkMSIInstallerFile)"
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension" WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
WixSrcFiles="@(SdkMsiWixSrcFiles)"> WixSrcFiles="@(SdkMsiWixSrcFiles)">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" /> <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop> </CreateLightCommandPackageDrop>
<MakeDir Directories="$(LightCommandPackagesDir)" />
<ZipDirectory
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target> </Target>
<Target Name="GenerateSdkPlaceholderMsi" <Target Name="GenerateSdkPlaceholderMsi"
@ -239,20 +234,15 @@
</ItemGroup> </ItemGroup>
<CreateLightCommandPackageDrop <CreateLightCommandPackageDrop
LightCommandWorkingDir="$(LightCommandObjDir)" LightCommandWorkingDir="$(LightCommandObjDir)"
OutputFolder="$(LightCommandPackagesDir)"
NoLogo="true" NoLogo="true"
Cultures="en-us" Cultures="en-us"
Out="$(SdkPlaceholderMSIInstallerFile)" InstallerFile="$(SdkPlaceholderMSIInstallerFile)"
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension" WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
WixSrcFiles="@(SdkPlaceholdMsiWixSrcFiles)" WixSrcFiles="@(SdkPlaceholdMsiWixSrcFiles)"
AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk"> AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" /> <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop> </CreateLightCommandPackageDrop>
<MakeDir Directories="$(LightCommandPackagesDir)" />
<ZipDirectory
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target> </Target>
<Target Name="GenerateTemplatesMsis" <Target Name="GenerateTemplatesMsis"
@ -281,19 +271,14 @@
<CreateLightCommandPackageDrop <CreateLightCommandPackageDrop
LightCommandWorkingDir="$(LightCommandObjDir)" LightCommandWorkingDir="$(LightCommandObjDir)"
OutputFolder="$(LightCommandPackagesDir)"
NoLogo="true" NoLogo="true"
Cultures="en-us" Cultures="en-us"
Out="%(TemplatesMsiComponent.MSIInstallerFile)" InstallerFile="%(TemplatesMsiComponent.MSIInstallerFile)"
WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension" WixExtensions="WixUIExtension;WixDependencyExtension;WixUtilExtension"
WixSrcFiles="@(TemplatesMsiWixSrcFiles)"> WixSrcFiles="@(TemplatesMsiWixSrcFiles)">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" /> <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop> </CreateLightCommandPackageDrop>
<MakeDir Directories="$(LightCommandPackagesDir)" />
<ZipDirectory
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target> </Target>
<Target Name="SetupTemplatesMsis"> <Target Name="SetupTemplatesMsis">
@ -383,20 +368,15 @@
</ItemGroup> </ItemGroup>
<CreateLightCommandPackageDrop <CreateLightCommandPackageDrop
LightCommandWorkingDir="$(LightCommandObjDir)" LightCommandWorkingDir="$(LightCommandObjDir)"
OutputFolder="$(LightCommandPackagesDir)"
NoLogo="true" NoLogo="true"
Cultures="en-us" Cultures="en-us"
Out="$(CombinedFrameworkSdkHostMSIInstallerFile)" InstallerFile="$(CombinedFrameworkSdkHostMSIInstallerFile)"
WixExtensions="WixBalExtension;WixUtilExtension;WixTagExtension" WixExtensions="WixBalExtension;WixUtilExtension;WixTagExtension"
WixSrcFiles="@(BundleMsiWixSrcFiles)" WixSrcFiles="@(BundleMsiWixSrcFiles)"
AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk"> AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk">
<Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" /> <Output TaskParameter="OutputFile" PropertyName="_LightCommandPackageNameOutput" />
</CreateLightCommandPackageDrop> </CreateLightCommandPackageDrop>
<MakeDir Directories="$(LightCommandPackagesDir)" />
<ZipDirectory
DestinationFile="$(LightCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
SourceDirectory="$(LightCommandObjDir)/$(_LightCommandPackageNameOutput)"
Overwrite="true" />
</Target> </Target>
<Target Name="GenerateToolsetNupkg" <Target Name="GenerateToolsetNupkg"