Revert "Rename output package to Faithlife.Wpf."

This reverts commit fc59309.
Faithlife · Jun 3, 2022 · 2ab5b94 · 2ab5b94
1 parent 365b91d
commit 2ab5b94
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln
@@ -7,11 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xaml", "src\Microsof
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packaging", "packaging", "{0159B0F1-0626-4BED-8D1B-CBFF4F12C369}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Faithlife.Wpf", "Faithlife.Wpf", "{BF20132A-191F-4D34-9A1B-831772A6DFCF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Wpf.GitHub", "Microsoft.DotNet.Wpf.GitHub", "{BF20132A-191F-4D34-9A1B-831772A6DFCF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Faithlife.Wpf", "packaging\Faithlife.Wpf\Faithlife.Wpf.csproj", "{C847934A-828C-4EBB-A004-B0E97C8313F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Wpf.GitHub", "packaging\Microsoft.DotNet.Wpf.GitHub\Microsoft.DotNet.Wpf.GitHub.csproj", "{C847934A-828C-4EBB-A004-B0E97C8313F4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Faithlife.Wpf.ArchNeutral", "packaging\Faithlife.Wpf\Faithlife.Wpf.ArchNeutral.csproj", "{9A7E395B-E859-40E2-809D-EFB72CF3A2EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Wpf.GitHub.ArchNeutral", "packaging\Microsoft.DotNet.Wpf.GitHub\Microsoft.DotNet.Wpf.GitHub.ArchNeutral.csproj", "{9A7E395B-E859-40E2-809D-EFB72CF3A2EE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.DotNet.Arcade.Wpf.Sdk", "Microsoft.DotNet.Arcade.Wpf.Sdk", "{8A2ABE39-2D50-48CA-AC32-078BBA32757A}"
 EndProject

diff --git a/eng/WpfArcadeSdk/tools/Packaging.props b/eng/WpfArcadeSdk/tools/Packaging.props
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <GitHubTransportPackageName>Faithlife.Wpf$(TransportPackageNameSuffix)</GitHubTransportPackageName>
+    <GitHubTransportPackageName>Microsoft.DotNet.Wpf.GitHub$(TransportPackageNameSuffix)</GitHubTransportPackageName>
     <DncEngTransportPackageName>Microsoft.DotNet.Wpf.DncEng$(TransportPackageNameSuffix)</DncEngTransportPackageName>
 
     <!-- When ready to go live, remove .private suffix -->
@@ -59,7 +59,7 @@
     <!-- Built out of https://www.github.com/dotnet/wpf -->
     <PackageName Condition="'$(RepoLocation)'=='WindowsDesktopSdk'">$(WindowsDesktopSdkPackageName)</PackageName>
 
-    <RepositoryUrl>https://github.com/Faithlife/wpf</RepositoryUrl>
+    <RepositoryUrl Condition="'$(RepoLocation)'=='Internal'">https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</RepositoryUrl>
   </PropertyGroup>
 
 

diff --git a/eng/WpfArcadeSdk/tools/Packaging.targets b/eng/WpfArcadeSdk/tools/Packaging.targets
@@ -13,6 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <PackageName Condition="'$(CreateArchNeutralPackage)'!='true' And '$(PackageName)'!=''">$(PackageRuntimeIdentifierPrefix).$(PackageName)</PackageName>
     <NormalizedPackageName>$(PackageName.Replace('$(PackageRuntimeIdentifierPrefix).',''))</NormalizedPackageName>
     <NuspecPackageId>$(PackageName)</NuspecPackageId>
     <DevelopmentDependency Condition="'$(MsBuildSdkPackage)'=='true'">true</DevelopmentDependency>

diff --git a/eng/WpfArcadeSdk/tools/WpfProjectReference.targets b/eng/WpfArcadeSdk/tools/WpfProjectReference.targets
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="$(GitHubTransportPackageName)"
+    <PackageReference Include="runtime.$(WpfRuntimeIdentifier).$(GitHubTransportPackageName)"
                       Version="$(MicrosoftDotNetWpfGitHubVersion)"
                       ExcludeAssets="All"
                       GeneratePathProperty="True"
@@ -10,7 +10,7 @@
                              And '$(NoAutoMicrosoftDotNetWpfGitHubPackageReference)'!='true'
                              And '$(MicrosoftDotNetWpfGitHubPackage)'!=''"/>
 
-    <PackageReference Include="$(GitHubTransportPackageName)"
+    <PackageReference Include="runtime.$(WpfRuntimeIdentifier).$(GitHubTransportPackageName)"
                   Version="$(MicrosoftDotNetWpfGitHubVersion)"
                   ExcludeAssets="All"
                   GeneratePathProperty="True"

diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1
@@ -52,7 +52,7 @@ function CopyNativeBinariesToLocation($location, $localBinLocation)
     # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\win-x86
     # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\win-x64
 
-    $PackageName = "Faithlife.Wpf"
+    $PackageName = "Microsoft.DotNet.Wpf.GitHub"
     $BinaryLocationInPackage =  "win-$arch"
     CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage
 }
@@ -62,7 +62,7 @@ function CopyManagedBinariesToLocation($location, $localBinLocation)
     # x86 - artifacts\packaging\Debug\Microsoft.DotNet.Wpf.GitHub\lib\net6.0
     # x64 - artifacts\packaging\Debug\x64\Microsoft.DotNet.Wpf.GitHub\lib\net6.0
 
-    $PackageName = "Faithlife.Wpf"
+    $PackageName = "Microsoft.DotNet.Wpf.GitHub"
     $BinaryLocationInPackage = "net6.0"
     CopyPackagedBinaries $location $localBinLocation $PackageName $BinaryLocationInPackage
 }

diff --git a/.../Faithlife.Wpf/Check-AssemblyVersions.ps1 → ...Net.Wpf.GitHub/Check-AssemblyVersions.ps1 b/.../Faithlife.Wpf/Check-AssemblyVersions.ps1 → ...Net.Wpf.GitHub/Check-AssemblyVersions.ps1
diff --git a/...ing/Faithlife.Wpf/Directory.Build.targets → ...DotNet.Wpf.GitHub/Directory.Build.targets b/...ing/Faithlife.Wpf/Directory.Build.targets → ...DotNet.Wpf.GitHub/Directory.Build.targets
diff --git a/...life.Wpf/Faithlife.Wpf.ArchNeutral.csproj → ...soft.DotNet.Wpf.GitHub.ArchNeutral.csproj b/...life.Wpf/Faithlife.Wpf.ArchNeutral.csproj → ...soft.DotNet.Wpf.GitHub.ArchNeutral.csproj
@@ -8,6 +8,6 @@
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>
-    <PackageDescription>Custom version of WPF built by Faithlife</PackageDescription>
+    <PackageDescription>WPF Transport Package from dotnet/wpf repository</PackageDescription>
   </PropertyGroup>
 </Project>
diff --git a/packaging/Faithlife.Wpf/Faithlife.Wpf.csproj → ...GitHub/Microsoft.DotNet.Wpf.GitHub.csproj b/packaging/Faithlife.Wpf/Faithlife.Wpf.csproj → ...GitHub/Microsoft.DotNet.Wpf.GitHub.csproj
@@ -8,6 +8,6 @@
   <PropertyGroup>
     <PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
     <AssemblyName>$(PackageName)</AssemblyName>
-    <PackageDescription>Custom version of WPF built by Faithlife</PackageDescription>
+    <PackageDescription>WPF Transport Package from dotnet/wpf repository</PackageDescription>
   </PropertyGroup>
 </Project>