Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update RepoToolset to 1.0.0-beta2-62804-01 #2178

Merged
merged 6 commits into from
Apr 26, 2018
Merged

Update RepoToolset to 1.0.0-beta2-62804-01 #2178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dd10bc7
Update RepoToolset to 1.0.0-beta2-62804-01
tmat Apr 6, 2018
9bdc1c5
Merge branch 'release/2.1.3xx' into release/2.1.3xx-src
tmat Apr 25, 2018
b48cad2
Update dotnet SDK to 2.1.300-preview3-008616 (#2180)
tmat Apr 25, 2018
ad52646
Remove --log argument from build.sh
tmat Apr 25, 2018
97595d0
Exclude test projects from source build (#2181)
tmat Apr 25, 2018
765c4dc
Fix paths in MSBuildAllProjects (#2182)
tmat Apr 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ obj/
# Visual Studio
###############################################################################
.vs/
.dotnet/
Copy link
Member

@tannergooding tannergooding Apr 25, 2018 •
edited by tmat
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? We had them under artifacts, explicitly, in order to help prevent pollution of the root directory... #WontFix

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it's are not under artifacts anymore. Artifacts are meant for artifacts produced by the build, not by tools the build uses.

In reply to: 184185423 [](ancestors = 184185423)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are artifacts produced by the build. They may not be artifacts produced directly by our own source code, but they are artifacts that exist solely to support the build and that are not checked into the source tree. Having it under a single folder makes it very convenient to manage and clean up things, as you have a single location to track, rather than 4-5.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git clean -xfd cleans everything if that's what you want to do.

Cleaning up the dotnet installation is not common. Deleting artifacts without deleting dotnet is more common. Downloading and installing dotnet takes long time and is only needed when the version changes.

In reply to: 184195237 [](ancestors = 184195237)

.tools/
.packages/

# OS X Device Services Store
.DS_Store
27 changes: 1 addition & 26 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
<Project>

<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
</PropertyGroup>

<Import Project="build\NuGet.props"/>
<Import Project="build\Versions.props"/>

<PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
<RepoToolsetDir>$(NuGetPackageRoot)roslyntools.repotoolset\$(RoslynToolsRepoToolsetVersion)\tools\</RepoToolsetDir>
<RestoreSources>
https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json;
https://dotnet.myget.org/F/nuget-build/api/v3/index.json
</RestoreSources>
</PropertyGroup>

<PropertyGroup>
<ArtifactsDir>$(DOTNET_SDK_ARTIFACTS_DIR)</ArtifactsDir>
<ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(RepoRoot)artifacts\</ArtifactsDir>
Copy link
Member

@tannergooding tannergooding Apr 25, 2018 •
edited by tmat
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this set by RepoToolset now? #Resolved

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DOTNET_SDK_ARTIFACTS_DIR is no longer needed.

In reply to: 184185770 [](ancestors = 184185770)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean, it is still used by our tests for dogfooding.

Copy link
Member Author

@tmat tmat Apr 25, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That still needs to be cleaned up (I'll follow up on that later). It's used as an optional override of the artifacts directory path here:

sdk/src/Tests/Microsoft.NET.TestFramework/TestContext.cs

Lines 100 to 104 in 9cf7788

string artifactsDir = Environment.GetEnvironmentVariable("DOTNET_SDK_ARTIFACTS_DIR");
if (string.IsNullOrEmpty(artifactsDir))
{
artifactsDir = Path.Combine(repoRoot, "artifacts");
}

Based on discussion with @dsplaisted the scenario this was needed for was to switch to a different version of dotnet SDK. This can be done by setting DOTNET_INSTALL_DIR instead. So DOTNET_SDK_ARTIFACTS_DIR is not needed anymore.

In reply to: 184195832 [](ancestors = 184195832)

<ArtifactsDir>$([MSBuild]::EnsureTrailingSlash($(ArtifactsDir)))</ArtifactsDir>
<DOTNET_INSTALL_DIR Condition="'$(DOTNET_INSTALL_DIR)' == ''">$(RepoRoot)artifacts\.dotnet\$(DotNetCliVersion)\</DOTNET_INSTALL_DIR>
Copy link
Member

@tannergooding tannergooding Apr 25, 2018 •
edited by tmat
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for this? #Resolved

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the install dir environment variable is set by build.ps1, if not set already.

In reply to: 184185819 [](ancestors = 184185819)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this break the scenario of building the solution from the command line, directly, rather than going through the build scripts?

</PropertyGroup>

<Project>
<PropertyGroup>
<RepositoryUrl>https://github.com/dotnet/sdk</RepositoryUrl>
<PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"

. "$ScriptRoot/build/build.sh" --build --restore --log "$@"
. "$ScriptRoot/build/build.sh" --build --restore "$@"
Copy link
Member

@tannergooding tannergooding Apr 25, 2018 •
edited by tmat
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was the log command removed? #Resolved

Copy link
Member

@dagood dagood Apr 25, 2018 •
edited by tmat
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not a valid arg in the new version of the repo toolset and caused source-build builds to fail. #Resolved

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The build now always produces binlog.

In reply to: 184189056 [](ancestors = 184189056)

17 changes: 0 additions & 17 deletions build/NuGet.props
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions build/Toolset.proj
View file
Open in desktop

This file was deleted.

19 changes: 7 additions & 12 deletions build/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,6 @@
<PreReleaseVersionLabel>rc1</PreReleaseVersionLabel>
</PropertyGroup>

<!-- Repo Toolset Features -->
<PropertyGroup>
<UsingToolMicrosoftNetCompilers>false</UsingToolMicrosoftNetCompilers>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this part of RepoToolset now?

</PropertyGroup>

<!-- Toolset Dependencies -->
<PropertyGroup>
<DotNetCliVersion>2.1.300-preview3-008616</DotNetCliVersion>
<RoslynToolsRepoToolsetVersion>1.0.0-beta-62615-02</RoslynToolsRepoToolsetVersion>
<VSWhereVersion>2.2.7</VSWhereVersion>
</PropertyGroup>

<!-- Production Dependencies -->
<PropertyGroup>
<MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
Expand All @@ -47,4 +35,11 @@
<MicrosoftNETTestSdkVersion>15.0.0</MicrosoftNETTestSdkVersion>
</PropertyGroup>

<PropertyGroup>
<RestoreSources>
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/packages/index.json;
https://dotnet.myget.org/F/nuget-build/api/v3/index.json
</RestoreSources>
</PropertyGroup>
</Project>
Loading