Skip to content

Move RepoToolset into arcade#284

Merged
alexperovich merged 102 commits intodotnet:masterfrom
alexperovich:alperovi/portRepoToolset
Jul 3, 2018
Merged

Move RepoToolset into arcade#284
alexperovich merged 102 commits intodotnet:masterfrom
alexperovich:alperovi/portRepoToolset

Conversation

@alexperovich
Copy link
Copy Markdown
Member

No description provided.

@@ -0,0 +1,123 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

This comment was marked as spam.

This comment was marked as spam.

using Microsoft.Build.Utilities;
using Tasks = System.Threading.Tasks;

namespace RoslynTools

This comment was marked as spam.

This comment was marked as spam.

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

Comment thread eng/Sdk.targets
<ItemGroup>
</ItemGroup>

<ItemGroup Condition="'$(EnableDefaultItems)' != 'false'">

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

Comment thread eng/Sdk.targets Outdated
</ItemGroup>
</Target>

<ItemGroup Condition="'$(EnableGeneratedPackageContent)' != 'false'">

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

Comment thread Directory.Build.props
</PropertyGroup>

<Import Project="Sdk.props" Sdk="RoslynTools.RepoToolset" />
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@weshaggard
Copy link
Copy Markdown
Member

I was expecting to see a commit that did the rename from repotools to arcade sdk did you do that inline with the merge? If so could you please try to do it as a separate commit.

@alexperovich
Copy link
Copy Markdown
Member Author

alexperovich commented Jun 29, 2018

@weshaggard this commit has that change 20ea860

Comment thread Directory.Build.targets Outdated
<Import Project="Sdk.targets" Sdk="RoslynTools.RepoToolset" />
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<Import Project="eng\Sdk.targets" Condition="'$(IsSdk)' == 'true'" />

This comment was marked as spam.

This comment was marked as spam.

Comment thread eng/Sdk.targets Outdated
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>

This comment was marked as spam.

This comment was marked as spam.

Comment thread eng/Sdk.targets
</None>
</ItemGroup>

<ItemGroup>

This comment was marked as spam.

This comment was marked as spam.


<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" Publish="false" />
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" Publish="false" />

This comment was marked as spam.

This comment was marked as spam.

<PropertyGroup>
<RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)net461\Microsoft.DotNet.Arcade.Sdk.dll</RoslynToolsBuildTasksAssembly>
<RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)netcoreapp2.0\Microsoft.DotNet.Arcade.Sdk.dll</RoslynToolsBuildTasksAssembly>
<RoslynToolsBuildTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)net461\any\Microsoft.DotNet.Arcade.Sdk.dll</RoslynToolsBuildTasksAssembly>

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@alexperovich alexperovich merged commit 9517895 into dotnet:master Jul 3, 2018
@alexperovich alexperovich deleted the alperovi/portRepoToolset branch July 3, 2018 00:17
tmat added a commit to tmat/arcade that referenced this pull request Jul 13, 2018
@ericstj
Copy link
Copy Markdown
Member

ericstj commented Dec 10, 2018

@alexperovich was it your intention to bring back DownloadFile? It looks to me like @natemcmaster deleted it in #244

@alexperovich
Copy link
Copy Markdown
Member Author

No, my intention was that we should use https://docs.microsoft.com/en-us/visualstudio/msbuild/downloadfile-task?view=vs-2017 going forward.

@ericstj
Copy link
Copy Markdown
Member

ericstj commented Dec 10, 2018

@tmat
Copy link
Copy Markdown
Member

tmat commented Dec 11, 2018

Yes, we can do that. All machines should be on MSBuild 15.8 or above.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants