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

Target netstandard2.0 and net40 #74

Merged
merged 1 commit into from
May 8, 2019
Merged

Target netstandard2.0 and net40 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Update="Shouldly" Version="3.0.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Update="Microsoft.Wim" Version="1.2.4" />
<PackageReference Update="xunit" Version="2.4.0" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Update="Shouldly" Version="3.0.2" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Update="Microsoft.Wim" Version="1.2.11" />
<PackageReference Update="Microsoft.Win32.Registry" Version="4.5.0" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup>
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.2.13" />
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="2.3.138" />
</ItemGroup>

<ItemGroup Condition=" '$(EnableStyleCop)' != 'false' ">
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<Compile Include="..\GlobalSuppressions.cs" />
<AdditionalFiles Include="..\..\stylecop.json" Visible="False" />

<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2" />
<GlobalPackageReference Include="Microsoft.NetFramework.Analyzers" Version="2.6.2" />
<GlobalPackageReference Include="Roslyn.Diagnostics.Analyzers" Version="2.6.2" />
<GlobalPackageReference Include="Roslynator.Analyzers" Version="1.9.0" />
<GlobalPackageReference Include="Text.Analyzers" Version="2.6.2" />
<GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.9.2" />
<GlobalPackageReference Include="Microsoft.NetFramework.Analyzers" Version="2.9.2" />
<GlobalPackageReference Include="Roslyn.Diagnostics.Analyzers" Version="2.9.2" />
<GlobalPackageReference Include="Roslynator.Analyzers" Version="2.0.0" />
<GlobalPackageReference Include="Text.Analyzers" Version="2.6.4" />
</ItemGroup>
</Project>
8 changes: 6 additions & 2 deletions src/Microsoft.Dism/Microsoft.Dism.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net40</TargetFramework>
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
Expand All @@ -10,12 +10,16 @@
<Description>Managed API for Deployment Image Servicing and Management (DISM)</Description>
<Authors>Microsoft Corporation</Authors>
<Copyright>Copyright © 2014. All rights reserved.</Copyright>
<PackageLicenseUrl>https://github.com/josemesona/ManagedDism/blob/master/LICENSE</PackageLicenseUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/josemesona/ManagedDism</PackageProjectUrl>
<RepositoryUrl>https://github.com/josemesona/ManagedDism.git</RepositoryUrl>
<PackageTags>Dism</PackageTags>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>

<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
Expand Down