Skip to content

Fix convertToSDK.py to use mkall.targets for NuGet detection and improve ProjectReference generation #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 15 commits into
base: chore/migrateToSdkCsproj
Choose a base branch
from
Draft

Fix convertToSDK.py to use mkall.targets for NuGet detection and improve ProjectReference generation #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f6ccf75
Initial plan
Copilot Sep 29, 2025
385c206
Implement improved convertToSDK.py with mkall.targets-based NuGet det…
Copilot Sep 29, 2025
e028305
Complete convertToSDK.py improvements and validate functionality
Copilot Sep 29, 2025
53f35e9
Fix test package references causing build failures
Copilot Sep 29, 2025
68faa25
Revert "Fix test package references causing build failures"
Copilot Sep 29, 2025
c5abbef
Add PrivateAssets to test packages to exclude transitive deps
Copilot Sep 30, 2025
e14e5d9
Restore incorrectly clobbered project files
Copilot Sep 30, 2025
02869a5
Update package versions to fix conflicts and use wildcards
Copilot Sep 30, 2025
01ac92a
Fix LCM package wildcards to match beta versions
Copilot Sep 30, 2025
6c27a9f
Convert DesktopAnalytics and IPCFramework to PackageReferences
Copilot Sep 30, 2025
29a0b64
Fix package version downgrades found by dotnet restore
Copilot Sep 30, 2025
13597ca
Fix bare References and update convertToSDK.py script
Copilot Sep 30, 2025
21bd33e
Fix remaining bare References and package mappings
Copilot Sep 30, 2025
a1d0777
Fix Geckofx version and DotNetZip warnings
Copilot Sep 30, 2025
f6ba5df
Fix post .csproj conversion build issues
jasonleenaylor Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 11 additions & 141 deletions Bin/nmock/src/sample/sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,141 +1,11 @@
<VisualStudioProject>
<CSHARP
ProjectType = "Local"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
ProjectGuid = "{4C542415-4833-4A6A-B891-752743F1E689}"
SccProjectName = "Perforce Project"
SccLocalPath = "."
SccProvider = "MSSCCI:Perforce SCM"
>
<Build>
<Settings
ApplicationIcon = ""
AssemblyKeyContainerName = ""
AssemblyName = "sample"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
DefaultHTMLPageLayout = "Grid"
DefaultTargetSchema = "IE50"
DelaySign = "false"
OutputType = "Library"
PreBuildEvent = ""
PostBuildEvent = ""
RootNamespace = "sample"
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = ""
>
<Config
Name = "Debug"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "true"
NoStdLib = "false"
NoWarn = ""
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
<Config
Name = "Release"
AllowUnsafeBlocks = "false"
BaseAddress = "285212672"
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "TRACE"
DocumentationFile = ""
DebugSymbols = "false"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
NoWarn = ""
Optimize = "true"
OutputPath = "bin\Release\"
RegisterForComInterop = "false"
RemoveIntegerChecks = "false"
TreatWarningsAsErrors = "false"
WarningLevel = "4"
/>
</Settings>
<References>
<Reference
Name = "System"
AssemblyName = "System"
HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
/>
<Reference
Name = "System.XML"
AssemblyName = "System.Xml"
HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
/>
<Reference
Name = "System.Web"
AssemblyName = "System.Web"
HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Web.dll"
/>
<Reference
Name = "nunit.framework"
AssemblyName = "nunit.framework"
HintPath = "..\..\..\NUnit\bin\nunit.framework.dll"
/>
<Reference
Name = "nmock"
AssemblyName = "NMock"
HintPath = "..\..\NMock.dll"
/>
</References>
</Build>
<Files>
<Include>
<File
RelPath = "build.build"
BuildAction = "None"
/>
<File
RelPath = "order\Notifier.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "order\Order.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "order\OrderProcessor.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "order\OrderProcessorTest.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "random\Weather.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
RelPath = "random\WeatherTest.cs"
SubType = "Code"
BuildAction = "Compile"
/>
</Include>
</Files>
</CSHARP>
</VisualStudioProject>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>sample</AssemblyName>
<RootNamespace>sample</RootNamespace>
<TargetFramework>net48</TargetFramework>
<OutputType>Library</OutputType>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>168,169,219,414,649,1635,1702,1701</NoWarn>
</PropertyGroup>

</Project>
186 changes: 9 additions & 177 deletions Bin/nmock/src/src/NMock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,194 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{4859B9E5-3F65-4517-878C-AFC58B9D0035}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>NMock</AssemblyName>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<RootNamespace>NMock</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>3.5</OldToolsVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFramework>net48</TargetFramework>
<OutputType>Library</OutputType>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>168,169,219,414,649,1635,1702,1701</NoWarn>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>false</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>
</NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DebugType>none</DebugType>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\CallMethodOrder.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\CallMethodWithoutExpectation.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\CallMethodWithParams.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Constraints\Constraints.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Constraints\IConstraint.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\DynamicMock.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Dynamic\ClassGenerator.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Dynamic\InterfaceLister.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\IInvocationHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\IMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\IMock.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Invocation.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\IVerifiable.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Method.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\MethodSignature.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Mock.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\MockCall.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Remoting\MockServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\Remoting\RemotingMock.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\SingleMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="NMock\VerifyException.cs">
<SubType>Code</SubType>
</Compile>
<None Include="NMock\build.build" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>

</Project>
Loading
Loading