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

Merge pull request #7802 from dotnet-bot/master-UpdateDependencies

Browse source 
Update CoreSetup to preview1-25810-02 (master)
This commit is contained in:
Livar 2017-10-12 12:59:11 -07:00 • committed by GitHub
commit 8c589212c8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/DependencyVersions.props
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<CLI_SharedFrameworkVersion>2.1.0-preview1-25806-02</CLI_SharedFrameworkVersion> <CLI_SharedFrameworkVersion>2.1.0-preview1-25810-02</CLI_SharedFrameworkVersion>
<CLI_MSBuild_Version>15.5.0-preview-000090-0999971</CLI_MSBuild_Version> <CLI_MSBuild_Version>15.5.0-preview-000090-0999971</CLI_MSBuild_Version>
<CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version> <CLI_Roslyn_Version>2.3.2-beta1-61921-05</CLI_Roslyn_Version>
<CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version> <CLI_Roslyn_Satellites_Version>2.3.0-pre-20170727-1</CLI_Roslyn_Satellites_Version>
@ -25,8 +25,8 @@
<TemplateEngineVersion>1.0.0-beta2-20170828-305</TemplateEngineVersion> <TemplateEngineVersion>1.0.0-beta2-20170828-305</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170828-305</TemplateEngineTemplateVersion> <TemplateEngineTemplateVersion>1.0.0-beta2-20170828-305</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170828-305</TemplateEngineTemplate2_0Version> <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170828-305</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.1.0-preview1-25806-02</PlatformAbstractionsVersion> <PlatformAbstractionsVersion>2.1.0-preview1-25810-02</PlatformAbstractionsVersion>
<DependencyModelVersion>2.1.0-preview1-25806-02</DependencyModelVersion> <DependencyModelVersion>2.1.0-preview1-25810-02</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion> <CliCommandLineParserVersion>0.1.1-alpha-167</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion> <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
<MicroBuildVersion>0.2.0</MicroBuildVersion> <MicroBuildVersion>0.2.0</MicroBuildVersion>

3
src/redist/redist.csproj
View file

@ -199,7 +199,8 @@
AfterTargets="PublishMSBuildExtensions"> AfterTargets="PublishMSBuildExtensions">
<ItemGroup> <ItemGroup>
<!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error --> <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
<SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" /> <SdkFiles Include="$(PublishDir)/**/*"
Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*;$(PublishDir)/**/Microsoft.TestPlatform.Extensions.EventLogCollector.dll" />
<!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard --> <!-- Don't try to CrossGen .NET Framework support assemblies for .NET Standard -->
<SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" /> <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\net*\**\*" />