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

Merge pull request #224 from dotnet/darc-master-f8df1eac-23e1-4850-a076-450188ba9aff

Browse source 
Update dependency files
This commit is contained in:
Livar 2018-12-27 10:11:03 -08:00 • committed by GitHub
commit 6d22fa6e40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -2,9 +2,9 @@
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<!-- Winforms / WPF --> <!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version=""> <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-alpha-27218-5">
<Uri>https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted</Uri> <Uri>https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted</Uri>
<Sha></Sha> <Sha>01c3fb6e2fa0e58c29de950d2da97bc5006f5004</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>

4
eng/Versions.props
View file

@ -4,7 +4,6 @@
<PropertyGroup> <PropertyGroup>
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
</PropertyGroup> </PropertyGroup>
<!-- This is a fake version to fool arcade. In this repo, we handle the versioning <!-- This is a fake version to fool arcade. In this repo, we handle the versioning
of assets ourselves, since all we do is generate zips/tarballs and native installers. of assets ourselves, since all we do is generate zips/tarballs and native installers.
To actually update the version for this repo, look at src/redist/targets/Versions.targets --> To actually update the version for this repo, look at src/redist/targets/Versions.targets -->
@ -12,7 +11,6 @@
<VersionPrefix>1.0.0</VersionPrefix> <VersionPrefix>1.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel> <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ToolsetVersion>3.0.100-preview-009741</ToolsetVersion> <ToolsetVersion>3.0.100-preview-009741</ToolsetVersion>
</PropertyGroup> </PropertyGroup>
@ -45,7 +43,7 @@
<SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion> <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion> <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion> <AspNetCoreVersion>$(MicrosoftAspNetCoreAppPackageVersion)</AspNetCoreVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-alpha-27128-4</MicrosoftWindowsDesktopAppPackageVersion> <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-alpha-27218-5</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion> <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
<MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion> <MicrosoftDotnetWpfProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWpfProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion> <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>$(MicrosoftWindowsDesktopPackageVersion)</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>