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

remove cross project cs dependencies from dotnet-cli-build.csproj

Browse source
This commit is contained in:
Krzysztof Wicher 2016-12-29 15:59:49 -08:00
parent 746d92337a
commit b813695fc0
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
build_projects/dotnet-cli-build/dotnet-cli-build.csproj
View file

@ -9,6 +9,13 @@
<OutputPath>bin\$(Configuration)</OutputPath> <OutputPath>bin\$(Configuration)</OutputPath>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback> <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8+wp8+wpa81</PackageTargetFallback>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Include="**\*.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\shared-build-targets-utils\shared-build-targets-utils.csproj" />
<ProjectReference Include="..\Microsoft.DotNet.Cli.Build.Framework\Microsoft.DotNet.Cli.Build.Framework.csproj" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NETStandard.Library"> <PackageReference Include="NETStandard.Library">
<Version>1.6.0</Version> <Version>1.6.0</Version>
@ -47,8 +54,4 @@
<Version>1.0.1-beta-000933</Version> <Version>1.0.1-beta-000933</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Compile Include="**\*.cs" />
<Compile Include="..\Microsoft.DotNet.Cli.Build.Framework\**\*.cs;..\shared-build-targets-utils\**\*.cs;" />
</ItemGroup>
</Project> </Project>

2
build_projects/shared-build-targets-utils/Publishing/AzurePublisher.cs
View file

@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
string url = CalculateRelativePathForFile(file, product, version); string url = CalculateRelativePathForFile(file, product, version);
CloudBlockBlob blob = _blobContainer.GetBlockBlobReference(url); CloudBlockBlob blob = _blobContainer.GetBlockBlobReference(url);
blob.UploadFromFileAsync(file).Wait(); blob.UploadFromFileAsync(file, FileMode.Open).Wait();
SetBlobPropertiesBasedOnFileType(blob); SetBlobPropertiesBasedOnFileType(blob);
return url; return url;
} }