Move RepoToolset into arcade#284
Conversation
Enable building multiple VS setup components
| @@ -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.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| using Microsoft.Build.Utilities; | ||
| using Tasks = System.Threading.Tasks; | ||
|
|
||
| namespace RoslynTools |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| @@ -0,0 +1,22 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| <ItemGroup> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition="'$(EnableDefaultItems)' != 'false'"> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| </ItemGroup> | ||
| </Target> | ||
|
|
||
| <ItemGroup Condition="'$(EnableGeneratedPackageContent)' != 'false'"> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| </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.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
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. |
|
@weshaggard this commit has that change 20ea860 |
| <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.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| <IsPackable>true</IsPackable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| </None> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
|
||
| <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.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| <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.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
|
@alexperovich was it your intention to bring back DownloadFile? It looks to me like @natemcmaster deleted it in #244 |
|
No, my intention was that we should use https://docs.microsoft.com/en-us/visualstudio/msbuild/downloadfile-task?view=vs-2017 going forward. |
|
I see, I think we should go redelete that task: https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Arcade.Sdk/src/DownloadFile.cs |
|
Yes, we can do that. All machines should be on MSBuild 15.8 or above. |
No description provided.