diff --git a/Samples/Net5ProjectionSample/ConsoleAppSample/ConsoleAppSample.sln b/Samples/Net5ProjectionSample/ConsoleAppSample.sln similarity index 90% rename from Samples/Net5ProjectionSample/ConsoleAppSample/ConsoleAppSample.sln rename to Samples/Net5ProjectionSample/ConsoleAppSample.sln index 96ec52264..6c0ec8454 100644 --- a/Samples/Net5ProjectionSample/ConsoleAppSample/ConsoleAppSample.sln +++ b/Samples/Net5ProjectionSample/ConsoleAppSample.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30509.190 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppSample", "ProjectionSampleConsoleApp\ConsoleAppSample.csproj", "{9623756E-90CE-449C-8BD8-36A2F8419DBF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppSample", "ConsoleAppSample\ConsoleAppSample.csproj", "{9623756E-90CE-449C-8BD8-36A2F8419DBF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Samples/Net5ProjectionSample/ConsoleAppSample/ProjectionSampleConsoleApp/ConsoleAppSample.csproj b/Samples/Net5ProjectionSample/ConsoleAppSample/ConsoleAppSample.csproj similarity index 100% rename from Samples/Net5ProjectionSample/ConsoleAppSample/ProjectionSampleConsoleApp/ConsoleAppSample.csproj rename to Samples/Net5ProjectionSample/ConsoleAppSample/ConsoleAppSample.csproj diff --git a/Samples/Net5ProjectionSample/ConsoleAppSample/ProjectionSampleConsoleApp/Program.cs b/Samples/Net5ProjectionSample/ConsoleAppSample/Program.cs similarity index 100% rename from Samples/Net5ProjectionSample/ConsoleAppSample/ProjectionSampleConsoleApp/Program.cs rename to Samples/Net5ProjectionSample/ConsoleAppSample/Program.cs diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/CppWinRTComponentProjectionSample.sln b/Samples/Net5ProjectionSample/CppWinRTComponentProjectionSample.sln similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/CppWinRTComponentProjectionSample.sln rename to Samples/Net5ProjectionSample/CppWinRTComponentProjectionSample.sln diff --git a/Samples/Net5ProjectionSample/README.md b/Samples/Net5ProjectionSample/README.md index 109573c23..c99bdd031 100644 --- a/Samples/Net5ProjectionSample/README.md +++ b/Samples/Net5ProjectionSample/README.md @@ -14,7 +14,7 @@ This sample demonstrates how to invoke C#/WinRT to build a .NET5 projection for Using Visual Studio: -1. Build the *CppWinRTProjectionSample* solution first. This generates the projection and interop assembly using cswinrt, and creates *SimpleMathComponent.nupkg* which can be referenced in consuming apps. If you run into errors restoring NuGet packages, look at the docs on [NuGet restore options](https://docs.microsoft.com/nuget/consume-packages/package-restore). You may need to configure your NuGet package manager settings to allow for package restores on build. +1. Build the *CppWinRTComponentProjectionSample* solution first. This generates the projection and interop assembly using cswinrt, and creates *SimpleMathComponent.nupkg* which can be referenced in consuming apps. If you run into errors restoring NuGet packages, look at the docs on [NuGet restore options](https://docs.microsoft.com/nuget/consume-packages/package-restore). You may need to configure your NuGet package manager settings to allow for package restores on build. 2. Build the *ConsoleAppSample* solution which references and restores *SimpleMathComponent.nupkg* to consume the projection. @@ -22,6 +22,6 @@ For building with the command line, execute the following: ```cmd nuget restore -msbuild /p:platform=x64;configuration=debug CppWinRTProjectionSample\CppWinRTComponentProjectionSample.sln -msbuild /p:platform=x64;configuration=debug ConsoleAppSample\ConsoleAppSample.sln +msbuild /p:platform=x64;configuration=debug CppWinRTComponentProjectionSample.sln +msbuild /p:platform=x64;configuration=debug ConsoleAppSample.sln ``` diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/PropertySheet.props b/Samples/Net5ProjectionSample/SimpleMathComponent/PropertySheet.props similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/PropertySheet.props rename to Samples/Net5ProjectionSample/SimpleMathComponent/PropertySheet.props diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.cpp b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.cpp similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.cpp rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.cpp diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.h b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.h similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.h rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.h diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.idl b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.idl similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMath.idl rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMath.idl diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.def b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.def similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.def rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.def diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj.filters b/Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj.filters similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj.filters rename to Samples/Net5ProjectionSample/SimpleMathComponent/SimpleMathComponent.vcxproj.filters diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/packages.config b/Samples/Net5ProjectionSample/SimpleMathComponent/packages.config similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/packages.config rename to Samples/Net5ProjectionSample/SimpleMathComponent/packages.config diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/pch.cpp b/Samples/Net5ProjectionSample/SimpleMathComponent/pch.cpp similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/pch.cpp rename to Samples/Net5ProjectionSample/SimpleMathComponent/pch.cpp diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/pch.h b/Samples/Net5ProjectionSample/SimpleMathComponent/pch.h similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathComponent/pch.h rename to Samples/Net5ProjectionSample/SimpleMathComponent/pch.h diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj b/Samples/Net5ProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj rename to Samples/Net5ProjectionSample/SimpleMathProjection/SimpleMathProjection.csproj diff --git a/Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec b/Samples/Net5ProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec similarity index 100% rename from Samples/Net5ProjectionSample/CppWinRTProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec rename to Samples/Net5ProjectionSample/SimpleMathProjection/nuget/SimpleMathProjection.nuspec