Forget the solution extension - workaround worked before, but under a…

… ".sln" folder (#532) * forget the solution extension - workaround worked before, but under a .sln dir * minor tweak * update to 1.0.1 and add props/targets to sln Co-authored-by: Angela Zhang <angzhang@microsoft.com>
microsoft · Oct 21, 2020 · fc55163 · fc55163
1 parent 1027a50
commit fc55163
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Samples/Net5ProjectionSample/CppWinRTComponentProjectionSample.sln b/Samples/Net5ProjectionSample/CppWinRTComponentProjectionSample.sln
@@ -7,6 +7,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleMathComponent", "Simp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleMathProjection", "SimpleMathProjection\SimpleMathProjection.csproj", "{3D562B38-115F-481C-ADE2-5A60EFBA1ED0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47FC5375-776F-4922-81DE-74E1A345F35F}"
+ ProjectSection(SolutionItems) = preProject
+ Directory.Build.props = Directory.Build.props
+ Directory.Build.targets = Directory.Build.targets
+ EndProjectSection
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|x64 = Debug|x64

diff --git a/Samples/Net5ProjectionSample/Directory.Build.props b/Samples/Net5ProjectionSample/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
  <PropertyGroup>
- <BuildOutDir>$([MSBuild]::NormalizeDirectory('$(SolutionDir.Replace("$(SolutionName)\", ""))', '_build', '$(Platform)', '$(Configuration)'))</BuildOutDir>
+ <BuildOutDir>$([MSBuild]::NormalizeDirectory('$(SolutionDir.Replace("$(SolutionFileName)\", ""))', '_build', '$(Platform)', '$(Configuration)'))</BuildOutDir>
  <OutDir>$([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'bin'))</OutDir>
  <IntDir>$([MSBuild]::NormalizeDirectory('$(BuildOutDir)', '$(MSBuildProjectName)', 'obj'))</IntDir>
  </PropertyGroup>

diff --git a/Samples/Net5ProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj b/Samples/Net5ProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj
@@ -7,7 +7,7 @@
 
  <ItemGroup>
  <ProjectReference Include="..\SimpleMathComponent\SimpleMathComponent.vcxproj" />
- <PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.8.0" />
+ <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.0.1" />
  </ItemGroup>
 
  <!--CsWinRT properties-->

diff --git a/Samples/Net5ProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec b/Samples/Net5ProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec
@@ -10,7 +10,7 @@
  <group targetFramework="UAP10.0" />
  <group targetFramework=".NETFramework4.6" />
  <group targetFramework="net5.0">
- <dependency id="Microsoft.Windows.CsWinRT" version="0.8.0" exclude="Build,Analyzers" />
+ <dependency id="Microsoft.Windows.CsWinRT" version="1.0.1" exclude="Build,Analyzers" />
  </group>
  </dependencies>
  </metadata>