Angzhang/flattensample (#453)

* flatten sample directory * flatten directory structure * update readme * update commands
microsoft · Oct 6, 2020 · 73299a3 · 73299a3
1 parent b8b2ea7
commit 73299a3
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 4 deletions.
diff --git a/...ple/ConsoleAppSample/ConsoleAppSample.sln → ...Net5ProjectionSample/ConsoleAppSample.sln b/...ple/ConsoleAppSample/ConsoleAppSample.sln → ...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/...nSampleConsoleApp/ConsoleAppSample.csproj → .../ConsoleAppSample/ConsoleAppSample.csproj b/...nSampleConsoleApp/ConsoleAppSample.csproj → .../ConsoleAppSample/ConsoleAppSample.csproj
diff --git a/...ple/ProjectionSampleConsoleApp/Program.cs → ...jectionSample/ConsoleAppSample/Program.cs b/...ple/ProjectionSampleConsoleApp/Program.cs → ...jectionSample/ConsoleAppSample/Program.cs
diff --git a/...ple/CppWinRTComponentProjectionSample.sln → ...ple/CppWinRTComponentProjectionSample.sln b/...ple/CppWinRTComponentProjectionSample.sln → ...ple/CppWinRTComponentProjectionSample.sln
diff --git a/Samples/Net5ProjectionSample/README.md b/Samples/Net5ProjectionSample/README.md
@@ -14,14 +14,14 @@ 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.
 
 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/...e/SimpleMathComponent/PropertySheet.props → ...e/SimpleMathComponent/PropertySheet.props b/...e/SimpleMathComponent/PropertySheet.props → ...e/SimpleMathComponent/PropertySheet.props
diff --git a/...Sample/SimpleMathComponent/SimpleMath.cpp → ...Sample/SimpleMathComponent/SimpleMath.cpp b/...Sample/SimpleMathComponent/SimpleMath.cpp → ...Sample/SimpleMathComponent/SimpleMath.cpp
diff --git a/...onSample/SimpleMathComponent/SimpleMath.h → ...onSample/SimpleMathComponent/SimpleMath.h b/...onSample/SimpleMathComponent/SimpleMath.h → ...onSample/SimpleMathComponent/SimpleMath.h
diff --git a/...Sample/SimpleMathComponent/SimpleMath.idl → ...Sample/SimpleMathComponent/SimpleMath.idl b/...Sample/SimpleMathComponent/SimpleMath.idl → ...Sample/SimpleMathComponent/SimpleMath.idl
diff --git a/...mpleMathComponent/SimpleMathComponent.def → ...mpleMathComponent/SimpleMathComponent.def b/...mpleMathComponent/SimpleMathComponent.def → ...mpleMathComponent/SimpleMathComponent.def
diff --git a/...MathComponent/SimpleMathComponent.vcxproj → ...MathComponent/SimpleMathComponent.vcxproj b/...MathComponent/SimpleMathComponent.vcxproj → ...MathComponent/SimpleMathComponent.vcxproj
diff --git a/...onent/SimpleMathComponent.vcxproj.filters → ...onent/SimpleMathComponent.vcxproj.filters b/...onent/SimpleMathComponent.vcxproj.filters → ...onent/SimpleMathComponent.vcxproj.filters
diff --git a/...ample/SimpleMathComponent/packages.config → ...ample/SimpleMathComponent/packages.config b/...ample/SimpleMathComponent/packages.config → ...ample/SimpleMathComponent/packages.config
diff --git a/...jectionSample/SimpleMathComponent/pch.cpp → ...jectionSample/SimpleMathComponent/pch.cpp b/...jectionSample/SimpleMathComponent/pch.cpp → ...jectionSample/SimpleMathComponent/pch.cpp
diff --git a/...rojectionSample/SimpleMathComponent/pch.h → ...rojectionSample/SimpleMathComponent/pch.h b/...rojectionSample/SimpleMathComponent/pch.h → ...rojectionSample/SimpleMathComponent/pch.h
diff --git a/...athProjection/SimpleMathProjection.csproj → ...athProjection/SimpleMathProjection.csproj b/...athProjection/SimpleMathProjection.csproj → ...athProjection/SimpleMathProjection.csproj
diff --git a/...jection/nuget/SimpleMathProjection.nuspec → ...jection/nuget/SimpleMathProjection.nuspec b/...jection/nuget/SimpleMathProjection.nuspec → ...jection/nuget/SimpleMathProjection.nuspec