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

[release/3.0.1xx] Update dependencies from dotnet/toolset (#596)

Browse source 
* Update dependencies from https://github.com/dotnet/toolset build 20190219.13

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.13

* Update dependencies from https://github.com/dotnet/toolset build 20190219.15

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.15

* Update dependencies from https://github.com/dotnet/toolset build 20190219.16

This change updates the following dependencies
- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview3.19119.16

* In test projects, append to RestoreAdditionalProjectSources instead of replacing it

9ffae2ef94

* Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory

* Don't try to chmod RunFsc.sh that no longer exists
This commit is contained in:
dotnet-maestro[bot] 2019-02-20 08:07:45 +00:00 committed by GitHub
parent 49f87e217a
commit b02292a944
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
<RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
</PropertyGroup>
<ItemGroup>

4
eng/Version.Details.xml
View file

@ -22,9 +22,9 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>ac8f12b90238542dfd2ea596178ae24ea20a0f55</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview.19080.2">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview3.19119.16">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>536d6a237f4de7b248e75b63256b75c1798e1bd7</Sha>
<Sha>4495bc03f1a37667b59bf1bd0e3e7046afa8c7f9</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19078.1">
<Uri>https://github.com/dotnet/standard</Uri>

2
eng/Versions.props
View file

@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview.19080.2</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview3.19119.16</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/EntityFrameworkCore -->

4
src/redist/targets/Crossgen.targets
View file

@ -60,6 +60,9 @@
<FSharpFiles Remove="$(SdkOutputDirectory)FSharp\**\*.resources.dll" />
<RemainingFiles Remove="$(SdkOutputDirectory)**\*.resources.dll" />
<!-- Don't crossgen reference assemblies redisted with msbuild for RoslynCodeTaskFactory -->
<RemainingFiles Remove="$(SdkOutputDirectory)ref\*.dll" />
<DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.$(DIASymReaderCrossgenFilter).dll" />
</ItemGroup>
@ -146,6 +149,5 @@
<Exec Command="find $(SdkOutputDirectory) -type d -exec chmod 755 {} \;" />
<Exec Command="find $(SdkOutputDirectory) -type f -exec chmod 644 {} \;" />
<Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
</Target>
</Project>