Fix packaging

IntegrationTests/Directory.Packages.props

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="../src/Directory.Build.props" />
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
@@ -7,6 +8,6 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="NUnit" Version="4.5.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.1.0" />
-    <PackageVersion Include="ProjectFiles" Version="1.0.0" />
+    <PackageVersion Include="ProjectFiles" Version="$(Version)" />
   </ItemGroup>
 </Project>

IntegrationTests/nuget.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="local" value="../nugets" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU1608;NU1109;RS2008;RS1041</NoWarn>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <ResolveAssemblyReferencesSilent>true</ResolveAssemblyReferencesSilent>

src/ProjectFiles/ProjectFiles.csproj

@@ -17,8 +17,8 @@
     <PackageReference Include="Microsoft.Sbom.Targets" PrivateAssets="all" Condition="'$(CI)' == 'true'" />
     <EmbeddedResource Include="..\Templates\ProjectDirectory.cs"/>
     <EmbeddedResource Include="..\Templates\ProjectFile.cs"/>
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn5.0/cs" Visible="false" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn5.3/cs" Visible="false" Condition="'$(TargetFramework)' == 'net10.0'" />
+    <None Include="bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn5.0/cs" Visible="false" />
+    <None Include="bin\$(Configuration)\net10.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn5.3/cs" Visible="false" />
   </ItemGroup>
 
 </Project>

src/appveyor.yml

@@ -8,13 +8,19 @@ build_script:
     Invoke-WebRequest "https://dot.net/v1/dotnet-install.ps1" -OutFile "./dotnet-install.ps1"
     ./dotnet-install.ps1 -JSonFile src/global.json -Architecture x64 -InstallDir 'C:\Program Files\dotnet'
 - dotnet build src --configuration Release
-- dotnet test src --configuration Release --no-build --no-restore
 - dotnet build IntegrationTests --configuration Release
-- dotnet test IntegrationTests --configuration Release --no-build --no-restore
 # Test project-level build without $(SolutionDir)
 - dotnet build src/ConsumingTests/ConsumingTests.csproj --configuration Release --force
-- dotnet test src/ConsumingTests/ConsumingTests.csproj --configuration Release --no-build --no-restore
-
+- dotnet test src --configuration Release --no-build --no-restore --logger:trx --results-directory TestResults
+- dotnet test IntegrationTests --configuration Release --no-build --no-restore --logger:trx --results-directory TestResults
+- dotnet test src/ConsumingTests/ConsumingTests.csproj --configuration Release --no-build --no-restore --logger:trx --results-directory TestResults
+on_finish:
+- ps: |
+    Get-ChildItem TestResults\*.trx -ErrorAction SilentlyContinue | % {
+      (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", $_.FullName)
+    }
+on_failure:
+- ps: Get-ChildItem *.received.* -recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 test: off
 artifacts:
-- path: nugets\*.nupkg
+- path: nugets\*.nupkg