Produce non-portable symbols for .NET Framework (#164)

jeffkl · Jun 30, 2022 · 65a2751 · 65a2751
1 parent 3fc7c05
commit 65a2751
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,14 +1,14 @@
 <Project>
   <PropertyGroup>
+    <ArtifactsBasePath>$(MSBuildThisFileDirectory)artifacts\</ArtifactsBasePath>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
     <DefaultItemExcludes>*log</DefaultItemExcludes>
+    <Deterministic>true</Deterministic>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+    <LangVersion>Latest</LangVersion>
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)key.snk</AssemblyOriginatorKeyFile>
-    <ArtifactsBasePath>$(MSBuildThisFileDirectory)artifacts\</ArtifactsBasePath>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <Deterministic>true</Deterministic>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <Authors>jeffkl</Authors>
@@ -20,5 +20,6 @@
     <RepositoryType>Git</RepositoryType>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 </Project>
diff --git a/Directory.Build.rsp b/Directory.Build.rsp
@@ -2,4 +2,3 @@
 /ConsoleLoggerParameters:Verbosity=Minimal;Summary;ForceNoAlign
 /MaxCPUCount
 /NodeReuse:false
-/Property:NuGetInteractive=true
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,3 +1,9 @@
 <Project>
   <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.1.3" />
+  <PropertyGroup>
+    <DebugType Condition="'$(TargetFramework)' == 'net40'">Full</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Update="@(InternalsVisibleTo)" Key="0024000004800000940000000602000000240000525341310004000001000100b9ecd7499a80057a7d78307c187676f77c7a9be80dbe25db8378ccf231356f9018ed306c4b2461d5856c126cd06121c72432d8125cef9b98cf72e6ecd64e46648612acd6b15e8149d16baf9491fbfff81445aaf764b2f7292dc1903d9edc36d4eac9195cdc7ec8e3016953b4b8b29b1c0ea3b112cdfbf519d791b4d3fc3c66be" />
+  </ItemGroup>
 </Project>
diff --git a/Packages.props b/Packages.props
@@ -11,13 +11,8 @@
   </ItemGroup>
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.Build.Artifacts" Version="4.0.4" />
-    <GlobalPackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
-    <GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
-    <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.107" />
-    <GlobalPackageReference Include="Roslyn.Diagnostics.Analyzers" Version="3.3.3" />
-    <GlobalPackageReference Include="Roslynator.Analyzers" Version="4.1.1" />
 
     <GlobalPackageReference Include="StyleCop.Analyzers" Version="1.1.118" />
     <Compile Include="$(MSBuildThisFileDirectory)src\GlobalSuppressions.cs" Link="%(Filename)%(Extension)" />

diff --git a/src/Microsoft.Dism/Microsoft.Dism.csproj b/src/Microsoft.Dism/Microsoft.Dism.csproj
@@ -6,11 +6,10 @@
     <ArtifactsPath>$(ArtifactsBasePath)$(MSBuildProjectName)</ArtifactsPath>
     <Description>Managed API for Deployment Image Servicing and Management (DISM)</Description>
     <PackageTags>Dism</PackageTags>
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="PublicAPI.Shipped.txt" />
-    <Content Include="PublicAPI.Unshipped.txt" />
+    <None Include="PublicAPI.Shipped.txt" />
+    <None Include="PublicAPI.Unshipped.txt" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="All" />
@@ -20,4 +19,7 @@
     <Compile Update="Properties\Resources.Designer.cs" AutoGen="True" DesignTime="True" DependentUpon="Resources.resx" />
     <EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.Dism.Tests" />
+  </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Dism/Properties/AssemblyInfo.cs b/src/Microsoft.Dism/Properties/AssemblyInfo.cs
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.4",
+  "version": "2.5",
   "assemblyVersion": "1.0",
   "buildNumberOffset": -1,
   "publicReleaseRefSpec": [