Skip to content
This repository has been archived by the owner on Sep 13, 2022. It is now read-only.

Bump AssemblyVersion for nestandard.dll to 2.1.0.0 #1047

Merged
merged 17 commits into from Jan 16, 2019
Merged

Bump AssemblyVersion for nestandard.dll to 2.1.0.0 #1047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2a86ab2
Bump AssemblyVersion for nestandard.dll to 2.1.0.0
wtgodbe Jan 7, 2019
652fa70
Bump other version to 2.1
wtgodbe Jan 7, 2019
8a2dad7
Update netstandard src project
wtgodbe Jan 7, 2019
4a6c6c7
Add NETStandardMaximumVersion
wtgodbe Jan 7, 2019
30ceb5f
Enable netstandard2.1 build for extensions projects
wtgodbe Jan 8, 2019
aaf5d76
Use TargetFallback to create a compat mapping
ViktorHofer Jan 15, 2019
b5b2269
Restore LKG 2.0 version of netstandard
wtgodbe Jan 15, 2019
cff4621
Harvest netstandard2.0 assets into package
wtgodbe Jan 15, 2019
47bb861
Fix outputting netstandard2.0 into library package
wtgodbe Jan 15, 2019
4f59964
Use last stable version of NetStandard.library package
wtgodbe Jan 15, 2019
44ddc12
Explicitly restore NETStandard.Library
wtgodbe Jan 15, 2019
399a7bc
Remove unnecessary property
wtgodbe Jan 15, 2019
b51ec87
Fix casing
wtgodbe Jan 15, 2019
4a078e2
Disable fallback pacakge folders
wtgodbe Jan 16, 2019
a54c648
Disable implicit nuget fallback folder
wtgodbe Jan 16, 2019
e51ac40
Use PackageReference to NetStandard in Tools.props
wtgodbe Jan 16, 2019
cca360f
Disable implicit fallback folder
wtgodbe Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Expand Up @@ -16,6 +16,12 @@
<ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == ''">unused</ProjectAssetsFile>
</PropertyGroup>

<PropertyGroup>
<!-- Only import nuget.g.props files that we explicitly choose to import -->
<ImportProjectExtensionProps>false</ImportProjectExtensionProps>
<ImportProjectExtensionTargets>false</ImportProjectExtensionTargets>
</PropertyGroup>

<Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.props" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.props')" />

<PropertyGroup>
Expand Down
9 changes: 8 additions & 1 deletion build.proj
View file
Open in desktop
Expand Up @@ -16,7 +16,14 @@
<BuildDependsOn Condition="'$(SignPackages)'=='true'">$(BuildDependsOn);SignPackages</BuildDependsOn>
</PropertyGroup>

<Target Name="Restore" />
<Target Name="Restore">
<ItemGroup>
<_RestoreProjects Include="$(SourceDir)netstandard/pkg/NETStandard.Library.2.0.msbuild" />
</ItemGroup>

<MSBuild Projects="@(_RestoreProjects)"
Targets="Restore"/>
</Target>

<Target Name="BuildManaged">
<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions eng/Tools.props
View file
Open in desktop
Expand Up @@ -11,9 +11,6 @@

<!-- Need to keep in sync with CodeAnalysis.targets file. -->
<AnalyzerPropsFile>$(ArtifactsToolsetDir)Common\Tools.Analyzers.props</AnalyzerPropsFile>

<!-- Restore specific version of NetStandard.library -->
<NetStandardImplicitPackageVersion>$(NetStandardLibraryPackageVersion)</NetStandardImplicitPackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatPackageVersion)" />
Expand Down
12 changes: 12 additions & 0 deletions src/netstandard/pkg/NETStandard.Library.2.0.msbuild
View file
Open in desktop
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<BaseIntermediateOutputPath>$(SourceDir)</BaseIntermediateOutputPath>
<ExcludeRestorePackageImports>true</ExcludeRestorePackageImports>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="$(NetStandardLibraryPackage)" Version="$(NetStandardLibraryPackageVersion)" />
Copy link
Member

Choose a reason for hiding this comment

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

You might be able to get away with a hack to put this in tools.props as

    <PackageReference Include="$(NetStandardLibraryPackage)" Version="$(NetStandardLibraryPackageVersion)" ExcludeAssets="All" />

Copy link
Member

Choose a reason for hiding this comment

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

@wtgodbe I agree with Eric. A PackageReference in Tools.props would be cleaner.

</ItemGroup>
</Project>
12 changes: 9 additions & 3 deletions src/netstandard/pkg/NETStandard.Library.pkgproj
View file
Open in desktop
Expand Up @@ -25,6 +25,10 @@
<Facade>true</Facade>
</ProjectReference>

<NetStandard20Files Include="$(PackagesDir)$(NetStandardLibraryPackage)/$(NetStandardLibraryPackageVersion)/build/netstandard2.0/**">
<TargetPath>build/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
</NetStandard20Files>

<File Include="$(VersionTargetsSource)">
<TargetPath>build/$(NETStandardVersion)/$(Id).targets</TargetPath>
</File>
Expand All @@ -33,11 +37,13 @@
<TargetPath>lib/netstandard1.0</TargetPath>
</File>

<File Include="$(PackagesDir)$(NetStandardLibraryPackage)/$(NetStandardLibraryPackageVersion)/build/netstandard2.0/**">
<TargetPath>build/netstandard2.0/%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
</File>
<File Include="@(NetStandard20Files)" />
</ItemGroup>

<Target Name="EnsureRestoredNetStandardAssets" BeforeTargets="GenerateNuSpec">
<Error Condition="'@(NetStandard20Files)' == ''" Text="Could not find package assets for netstandard2.0" />
</Target>

<Target Name="StampTargets" BeforeTargets="GenerateNuSpec">
<PropertyGroup>
<_FacadeFiles Condition="'%(File.Facade)' == 'true' AND '%(File.Extension)' == '.dll'" >@(File->'%24(MSBuildThisFileDirectory)ref\%(FileName)%(Extension)')</_FacadeFiles>
Expand Down