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

Explicitly reference Roslyn compiler toolset version that will ship in preview 7 #727

Merged
merged 2 commits into from
Jul 3, 2019
Merged

Explicitly reference Roslyn compiler toolset version that will ship in preview 7 #727

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
4368272
Explicitly reference Roslyn compiler toolset version that will ship i…
dougbu Jul 2, 2019
9262e80
Use MicrosoftNetCompilersToolsetPackageVersion
wtgodbe Jul 3, 2019
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
8 changes: 8 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,12 @@
<PropertyGroup>
<BundledNETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
</PropertyGroup>

<ItemGroup>
<!-- Track compiler separately from Arcade.-->
<PackageReference Include="Microsoft.Net.Compilers.Toolset"
Version="$(MicrosoftNetCompilersToolsetPackageVersion)"
Copy link
Member Author

Choose a reason for hiding this comment

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

I couldn't get darc to accept MicrosoftNetCompilersToolsetPackageVersion when I tried in EF Core and it updated Version.props correctly using MicrosoftNetCompilersToolsetVersion. But, I agree MicrosoftNetCompilersToolsetVersion looked weird. Glad to see this fixed.

PrivateAssets="all"
IsImplicitlyDefined="true" />
</ItemGroup>
</Project>
6 changes: 5 additions & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>df2b1489de5d4b8211c5e132d299a83523ce742a</Sha>
</Dependency>
<!--
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
Expand All @@ -64,5 +64,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>89fab80685c91024c8f9e21f1c37f62580f648f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.3.0-beta1-19351-01">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>c91adff42c488aef2c2c532a7b053fb55e0c16ea</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 6 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<!-- Use .NET Framework reference assemblies from a nuget package so machine-global targeting packs do not need to be installed. -->
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
<!-- Opt-in to using the version of the Roslyn compiler bundled with Arcade. -->
<UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
</PropertyGroup>
<!-- Opt out Arcade features -->
<PropertyGroup>
Expand Down Expand Up @@ -43,6 +41,10 @@
https://vside.myget.org/F/vsmac/api/v3/index.json;
https://vside.myget.org/F/devcore/api/v3/index.json;
</RestoreSources>
<RestoreSources Condition="'$(DotNetBuildOffline)' != 'true' AND $(MicrosoftNetCompilersToolsetPackageVersion.Contains('-')) ">
$(RestoreSources);
https://dotnet.myget.org/F/roslyn/api/v3/index.json;
</RestoreSources>
</PropertyGroup>
<!--

Expand All @@ -68,6 +70,8 @@
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.6.0-preview7.19329.3</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemTextEncodingsWebPackageVersion>4.6.0-preview7.19329.3</SystemTextEncodingsWebPackageVersion>
<SystemReflectionMetadataPackageVersion>1.7.0-preview7.19329.3</SystemReflectionMetadataPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.3.0-beta1-19351-01</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup Label="Dependency version settings">
<!--
Expand Down