Skip to content

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

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

Closed
tmat wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd10bc7
Update RepoToolset to 1.0.0-beta2-62804-01
tmat Apr 6, 2018
95990ba
Merge branch 'release/2.1.3xx' into RT1.0.0-beta2-62804-01
Apr 17, 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/
.tools/
.packages/

# OS X Device Services Store
.DS_Store
24 changes: 2 additions & 22 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,11 @@
<Project>

<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
Copy link
Copy Markdown
Member

@dsplaisted dsplaisted Apr 24, 2018

Choose a reason for hiding this comment

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

This is adding a path to a Directory.Build.props in the parent folder. It should probably be:

<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)Directory.Build.props</MSBuildAllProjects>

</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>
<ArtifactsDir>$([MSBuild]::EnsureTrailingSlash($(ArtifactsDir)))</ArtifactsDir>
<DOTNET_INSTALL_DIR Condition="'$(DOTNET_INSTALL_DIR)' == ''">$(RepoRoot)artifacts\.dotnet\$(DotNetCliVersion)\</DOTNET_INSTALL_DIR>
</PropertyGroup>


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

</Project>
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.

21 changes: 8 additions & 13 deletions build/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,10 @@

<!-- Repo Version Information -->
<PropertyGroup>
<VersionBase>2.1.300</VersionBase>
<VersionPrefix>2.1.300</VersionPrefix>
<PreReleaseVersionLabel>preview3</PreReleaseVersionLabel>
</PropertyGroup>

<!-- Repo Toolset Features -->
<PropertyGroup>
<UsingToolMicrosoftNetCompilers>false</UsingToolMicrosoftNetCompilers>
</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>
Copy link
Copy Markdown
Member

@weshaggard weshaggard Apr 6, 2018

Choose a reason for hiding this comment

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

Do we need to condition these for offline build?

Copy link
Copy Markdown
Member Author

@tmat tmat Apr 6, 2018

Choose a reason for hiding this comment

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

No, these are overridden by the toolset when building offline. https://github.com/dotnet/roslyn-tools/blob/master/sdks/RepoToolset/tools/DefaultVersions.props#L63

$(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