pr feedback

src/Authoring/cswinmd/CsWinMD.csproj

@@ -3,11 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <LangVersion>preview</LangVersion>
     <Authors>Microsoft Corporation</Authors>
     <Company>Microsoft Corporation</Company>
     <Product>C#/WinRT</Product>
-    <PackageId>CsWinMD</PackageId>
+    <PackageId>Microsoft.Windows.CsWinMD</PackageId>
 
     <FileVersion>$(VersionNumber)</FileVersion>
     <Version>$(VersionNumber)</Version>

src/Authoring/cswinmd/Program.cs

@@ -45,19 +45,23 @@ class Program
         /// <param name="verbose">Verbose logging</param>
         /// <param name="nologo">Don't print logo</param>
         /// Uses System.CommandLine.Dragonfruit
+        #nullable enable
         public static void Main(string[] i, string o, string? sdkVersion, bool? verbose, bool? nologo)
         {
             if (!nologo.HasValue || !nologo.Value)
             {
                 Console.WriteLine($"CSWinMD {Assembly.GetExecutingAssembly().GetName().Version}");
             }
-            var outFolder = string.IsNullOrEmpty(o) ? Environment.GetEnvironmentVariable("TEMP") : o;
+            var outFolder = string.IsNullOrEmpty(o) ? Environment.GetEnvironmentVariable("TEMP")! : o!;
             try
             {
                 if (i.Length == 0)
                 {
                     Console.Error.WriteLine("No C# source files specified");
                     return;
+                } else if (i.Length > 1)
+                {
+                    throw new NotImplementedException("Compiling more than one file is not yet implemented");
                 }
 
                 string inputFile = i[0];
@@ -87,7 +91,7 @@ public static void Main(string[] i, string o, string? sdkVersion, bool? verbose,
                     Directory.CreateDirectory(outFolder);
                 }
                 var cp = new ConfigProvider();
-                var config = cp.GlobalOptions as ConfigOptions;
+                var config = (cp.GlobalOptions as ConfigOptions)!;
                 config.Values["build_property.AssemblyName"] = assemblyName;
                 config.Values["build_property.AssemblyVersion"] = "0.0.0.1";
                 config.Values["build_property.CsWinRTGeneratedFilesDir"] = outFolder;
@@ -106,12 +110,16 @@ public static void Main(string[] i, string o, string? sdkVersion, bool? verbose,
                 var res = d.GetRunResult();
                 if (!res.Diagnostics.IsEmpty)
                 {
+                    Console.WriteLine();
                     foreach (var v in res.Diagnostics)
                     {
                         Console.WriteLine(v.GetMessage());
                         Console.WriteLine($"\t\tIn {v.Location.GetLineSpan()}");
                     }
                     Console.WriteLine();
+                } else
+                {
+                    Console.WriteLine($" => {outFolder}\\{componentName}.winmd");
                 }
             }
             catch (Exception e)
@@ -130,23 +138,30 @@ public static void Main(string[] i, string o, string? sdkVersion, bool? verbose,
             }
         }
 
+
         private static bool IsVersion(string v)
         {
             return Version.TryParse(Path.GetFileName(v), out var _);
         }
+
+        [SuppressMessage("Interoperability", "CA1416:Validate platform compatibility", Justification = "CSWinMD only runs on Windows")]
         private static string GetWindowsWinMdPath(string? sdkVersion)
         {
             using var hklm = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32);
             using var roots = hklm.OpenSubKey(@"SOFTWARE\Microsoft\Windows Kits\Installed Roots");
-            var kitsRoot10 = (string)roots.GetValue("KitsRoot10");
+            var kitsRoot10 = (string)roots!.GetValue("KitsRoot10")!;
             var unionMetadata = Path.Combine(kitsRoot10, "UnionMetadata");
             if (sdkVersion == null)
             {
                 var dirs = Directory.EnumerateDirectories(unionMetadata);
-                sdkVersion = Path.GetFileName(dirs.Where(IsVersion).Last());
+                var versions = dirs.Where(IsVersion).ToList();
+                versions.Sort();
+                sdkVersion = Path.GetFileName(versions.Last());
             }
             var path = Path.Combine(kitsRoot10, "UnionMetadata", sdkVersion, "Windows.winmd");
             return path;
         }
+
+        #nullable restore
     }
 }

src/Authoring/cswinmd/build/cswinmd.targets

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="ProduceWinMDFromCSharpComponent" BeforeTargets="InsertComponentWinMD">
+  <Target Name="CSWinMDProduceWinMDFromCSharpComponent" BeforeTargets="CSWinMDInsertComponentWinMD">
     <PropertyGroup>
       <CsWinMDPath Condition="'$(CsWinMDPath)'==''">$(MSBuildThisFileDirectory)..\tools\CsWinMD.exe</CsWinMDPath>
       <CsWinMDOutputPath Condition="'$(CsWinMDOutputPath)'==''">$(OutDir)cswinmd-$(ProjectName)</CsWinMDOutputPath>
     </PropertyGroup>
-    <Message Text="Producing winmd for %(CSharpCppComponent.Identity)" Importance="High" />
-    <Message Text="$(CsWinMDPath) -i %(CSharpCppComponent.FullPath) -o $(CsWinMDOutputPath)" Importance="High" />
+    <Message Text="Producing winmd for %(CSWinMDComponent.Identity)" Importance="High" />
+    <Message Text="$(CsWinMDPath) -i %(CSWinMDComponent.FullPath) -o $(CsWinMDOutputPath)" Importance="High" />
     <MakeDir Directories="$(CSWinMDOutputPath)" />
-    <Exec Command="$(CsWinMDPath) -i %(CSharpCppComponent.FullPath) -o $(CsWinMDOutputPath)" />
+    <Exec Command="$(CsWinMDPath) -i %(CSWinMDComponent.FullPath) -o $(CsWinMDOutputPath)" />
   </Target>
 
-  <Target Name="InsertComponentWinMD" AfterTargets="GetCppWinRTMdMergeInputs;CppWinRTMergeProjectWinMDInputs" BeforeTargets="CppWinRTMakeComponentProjection">
+  <Target Name="CSWinMDInsertComponentWinMD" AfterTargets="GetCppWinRTMdMergeInputs;CppWinRTMergeProjectWinMDInputs" BeforeTargets="CppWinRTMakeComponentProjection">
     <ItemGroup>
-      <CppWinRTMdMergeInputs Include="@(CSharpCppComponent->'$(CsWinMDOutputPath)\%(FileName).winmd')">
+      <CppWinRTMdMergeInputs Include="@(CSWinMDComponent->'$(CsWinMDOutputPath)\%(FileName).winmd')">
         <IsWinMDFile>true</IsWinMDFile>
       </CppWinRTMdMergeInputs>
     </ItemGroup>

src/Tests/CppComponent/CppComponent.cs → src/Tests/CSWinMDComponent/CSWinMDComponent.cs

@@ -1,4 +1,4 @@
-namespace CppComponent
+namespace CSWinMDComponent
 {
     public enum E1
     {

src/Tests/CppComponent/CppComponent.vcxproj → src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj

@@ -7,8 +7,8 @@
     <CppWinRTGenerateWindowsMetadata>true</CppWinRTGenerateWindowsMetadata>
     <MinimalCoreWin>true</MinimalCoreWin>
     <ProjectGuid>{d10dc47a-db45-491c-852e-2b2165f25f86}</ProjectGuid>
-    <ProjectName>CppComponent</ProjectName>
-    <RootNamespace>CppComponent</RootNamespace>
+    <ProjectName>CSWinMDComponent</ProjectName>
+    <RootNamespace>CSWinMDComponent</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -98,7 +98,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <ModuleDefinitionFile>CppComponent.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>CSWinMDComponent.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -128,8 +128,8 @@
     <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CppComponent.cs" />
-    <None Include="CppComponent.def" />
+    <None Include="CSWinMDComponent.cs" />
+    <None Include="CSWinMDComponent.def" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
@@ -139,7 +139,7 @@
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <CSharpCppComponent Include="CppComponent.cs" />
+    <CSWinMDComponent Include="CSWinMDComponent.cs" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup Label="CSWinMD overrides">

src/Tests/CppComponent/CppComponent.vcxproj.filters → src/Tests/CSWinMDComponent/CSWinMDComponent.vcxproj.filters

@@ -19,8 +19,8 @@
     <ClInclude Include="Class1.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CppComponent.def" />
-    <None Include="CppComponent.cs" />
+    <None Include="CSWinMDComponent.def" />
+    <None Include="CSWinMDComponent.cs" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

src/Tests/CSWinMDComponent/Class1.cpp

@@ -0,0 +1,12 @@
+#pragma once
+#include "pch.h"
+
+#include <winrt/CSWinMDComponent.h>
+
+#include "Class1.h"
+#include <Class1.g.cpp>
+
+namespace winrt::CSWinMDComponent::implementation
+{
+
+}

src/Tests/CppComponent/Class1.h → src/Tests/CSWinMDComponent/Class1.h

@@ -2,7 +2,7 @@
 #include "Class1.g.h"
 #include <iostream>
 
-namespace winrt::CppComponent::implementation
+namespace winrt::CSWinMDComponent::implementation
 {
   struct Class1 : Class1T<Class1>
   {
@@ -13,7 +13,7 @@ namespace winrt::CppComponent::implementation
     }
   };
 }
-namespace winrt::CppComponent::factory_implementation
+namespace winrt::CSWinMDComponent::factory_implementation
 {
   struct Class1 : Class1T<Class1, implementation::Class1>
   {

src/cswinrt.sln

@@ -127,7 +127,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OOPExe", "Tests\OOPExe\OOPE
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CsWinMD", "Authoring\CsWinMD\CsWinMD.csproj", "{B63DC238-AF5B-4790-B038-4F5ABE09F963}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppComponent", "Tests\CppComponent\CppComponent.vcxproj", "{D10DC47A-DB45-491C-852E-2B2165F25F86}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CSWinMDComponent", "Tests\CSWinMDComponent\CSWinMDComponent.vcxproj", "{D10DC47A-DB45-491C-852E-2B2165F25F86}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution