Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
462e23c
Initial plan
Copilot Sep 25, 2025
96cef7f
Complete migration of all .csproj files to SDK format
Copilot Sep 25, 2025
4553429
Clean up backup files and complete migration
Copilot Sep 25, 2025
315cf91
Fix linting issues: shorten commit messages and clean whitespace
Copilot Sep 25, 2025
d008781
Fix FwBuildTasks MSBuild dependencies and remove obsolete imports
Copilot Sep 25, 2025
ddb30ca
Revert FwBuildTasks to classic project format for MSBuild compatibility
Copilot Sep 25, 2025
752173e
Revert to SDK format and upgrade all projects to .NET Framework 4.8
Copilot Sep 25, 2025
3a83aed
Fix GenerateFwTargets file move error when .bad file exists
Copilot Sep 25, 2025
9151f85
Add comprehensive logging to GenerateFwTargets task for debugging
Copilot Sep 25, 2025
8fdec6d
Fix trailing whitespace in CollectTargets.cs
Copilot Sep 25, 2025
39686eb
Fix trailing whitespace in .csproj files
Copilot Sep 25, 2025
5357260
Fix compile error: replace m_log with Log in CollectTargets
Copilot Sep 25, 2025
76c8b74
Fix null reference exception in AssemblyName for SDK-style projects
Copilot Sep 26, 2025
c5e0adc
Fix AssemblyName property usage in WriteTargetFiles method
Copilot Sep 26, 2025
ede1a44
Add debugging output to show generated targets file content on error
Copilot Sep 26, 2025
ea8cb33
Merge branch 'release/9.3' into copilot/fix-bd618919-20fe-4ac6-b3d7-4…
jasonleenaylor Sep 26, 2025
1baf8aa
Always print generated FieldWorks.targets file content for debugging
Copilot Sep 26, 2025
8607acf
Restore Debug/Release configurations and fix DefineConstants handling
Copilot Sep 26, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Generated or Downloaded (as part of the build process)
# SDK-style projects auto-include files, reducing the need for explicit entries
GeneratedAssemblyInfo.cs
Collection.cpp
.vs/
Expand Down
162 changes: 21 additions & 141 deletions Bin/nmock/src/sample/sample.csproj
Original file line number Diff line number Diff line change
@@ -1,141 +1,21 @@
<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>
<?xml version='1.0' encoding='utf-8'?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net48</TargetFramework>
<OutputPath>../../../../Output/$(Configuration)</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>TRACE</DefineConstants>
<DebugSymbols>false</DebugSymbols>
<DebugType>none</DebugType>
<Optimize>true</Optimize>
</PropertyGroup>
</Project>
191 changes: 15 additions & 176 deletions Bin/nmock/src/src/NMock.csproj
Original file line number Diff line number Diff line change
@@ -1,194 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
<?xml version='1.0' encoding='utf-8'?>
<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>
<TargetFramework>net48</TargetFramework>
<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>
</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>
<OutputPath>../../../../Output/$(Configuration)</OutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<NoWarn>
</NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
<Optimize>false</Optimize>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<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>
<Optimize>true</Optimize>
</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>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</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