diff options
author | csharptest <roger@csharptest.net> | 2011-10-02 16:33:22 -0500 |
---|---|---|
committer | rogerk <devnull@localhost> | 2011-10-02 16:33:22 -0500 |
commit | d444748edc798f48d80cb250cc3bfda913d8cfff (patch) | |
tree | 804c25c81f12dd82f109d3b960b21b729220078f /lib | |
parent | 2e89071876750487160fef06295143837d571cd1 (diff) | |
download | protobuf-d444748edc798f48d80cb250cc3bfda913d8cfff.tar.gz protobuf-d444748edc798f48d80cb250cc3bfda913d8cfff.tar.bz2 protobuf-d444748edc798f48d80cb250cc3bfda913d8cfff.zip |
Several build related changes in this commit:
1. Refactoring of build to allow multiple target frameworks
2. Addition of multiple Silverlight versions
3. Renamed *_Silverlight2 configurations to *_Silverlight
4. Added batch files for each framework build (Build20, Build35, Build40)
5. Moved the package building into MSBuild tasks
6. BuildAll.bat now builds all packages in one build
7. Removed Generate*Package.bat batch files (replaced by BuildAll.bat)
8. Removed the ability to build with 3.5 MSBuild
9. Source is only generated with Release/2.0 build of ProtoGen
10. Removed unit testing proto files from packaging
11. Removed the remaining 'pause' statements from all batch files
12. RunBenchmarks target now builds with .NET 2.0 instead of 4.0
13. Benchmark arguments can now be specified with BenchmarkArgs parameter
14. ProtoBench now supports '/log:path' so console can still see progress
15. Updated PublishRelease.bat and *.nuspec for new build output
16. Updated ProtocolBuffers.Serialization.csproj to omit extensions for 2.0
17. Added NUnit console configurations for each .NET framework version
Diffstat (limited to 'lib')
-rw-r--r-- | lib/NUnit 2.2.8.0/nunit-console.v2.0.config (renamed from lib/NUnit 2.2.8.0/nunit-console.exe.config) | 5 | ||||
-rw-r--r-- | lib/NUnit 2.2.8.0/nunit-console.v3.5.config | 102 | ||||
-rw-r--r-- | lib/NUnit 2.2.8.0/nunit-console.v4.0.config | 102 |
3 files changed, 209 insertions, 0 deletions
diff --git a/lib/NUnit 2.2.8.0/nunit-console.exe.config b/lib/NUnit 2.2.8.0/nunit-console.v2.0.config index 10bc6654..f01f07d0 100644 --- a/lib/NUnit 2.2.8.0/nunit-console.exe.config +++ b/lib/NUnit 2.2.8.0/nunit-console.v2.0.config @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="Windows-1252"?> <configuration> + + <startup> + <requiredRuntime version="v2.0.50727" /> + </startup> + <!-- Application settings for NUnit-console.exe. Do NOT put settings for use by your tests here. diff --git a/lib/NUnit 2.2.8.0/nunit-console.v3.5.config b/lib/NUnit 2.2.8.0/nunit-console.v3.5.config new file mode 100644 index 00000000..f01f07d0 --- /dev/null +++ b/lib/NUnit 2.2.8.0/nunit-console.v3.5.config @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<configuration> + + <startup> + <requiredRuntime version="v2.0.50727" /> + </startup> + + <!-- + Application settings for NUnit-console.exe. Do NOT put settings + for use by your tests here. + --> + <appSettings> + + <!-- + Specify the location to be used by .NET for the cache + --> + <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" /> + + </appSettings> + + <!-- + The startup section may be used to specify the runtime versions + supported in the order that they will be used if more than one + is present. As supplied, this section is commented out, which + causes nunit-console to use the version of the framework with + which it was built. + + Since .NET 1.0 does not recognize the <supportedRuntime> elements, + a <requiredRuntime> element is used in case it is the only version + of the framework that is installed. + --> + <!-- + <startup> + <supportedRuntime version="v2.0.50727" /> + <supportedRuntime version="v2.0.50215" /> + <supportedRuntime version="v2.0.40607" /> + <supportedRuntime version="v1.1.4322" /> + <supportedRuntime version="v1.0.3705" /> + + <requiredRuntime version="v1.0.3705" /> + </startup> + --> + + <!-- + The following <runtime> section allows running nunit under + .NET 1.0 by redirecting assemblies. The appliesTo attribute + causes the section to be ignored except under .NET 1.0version 1 + on a machine with only the .NET version 1.0 runtime installed. + If application and its tests were built for .NET 1.1 you will + also need to redirect system assemblies in the test config file. + --> + + <runtime> + + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" + appliesTo="v1.0.3705"> + + <dependentAssembly> + <assemblyIdentity name="System" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Data" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Drawing" + publicKeyToken="b03f5f7f11d50a3a" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Windows.Forms" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Xml" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + </assemblyBinding> + + </runtime> + +</configuration>
\ No newline at end of file diff --git a/lib/NUnit 2.2.8.0/nunit-console.v4.0.config b/lib/NUnit 2.2.8.0/nunit-console.v4.0.config new file mode 100644 index 00000000..999eed1c --- /dev/null +++ b/lib/NUnit 2.2.8.0/nunit-console.v4.0.config @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<configuration> + + <startup useLegacyV2RuntimeActivationPolicy="true"> + <requiredRuntime version="v4.0.30319" safemode="true"/> + </startup> + + <!-- + Application settings for NUnit-console.exe. Do NOT put settings + for use by your tests here. + --> + <appSettings> + + <!-- + Specify the location to be used by .NET for the cache + --> + <add key="shadowfiles.path" value="%temp%\nunit20\ShadowCopyCache" /> + + </appSettings> + + <!-- + The startup section may be used to specify the runtime versions + supported in the order that they will be used if more than one + is present. As supplied, this section is commented out, which + causes nunit-console to use the version of the framework with + which it was built. + + Since .NET 1.0 does not recognize the <supportedRuntime> elements, + a <requiredRuntime> element is used in case it is the only version + of the framework that is installed. + --> + <!-- + <startup> + <supportedRuntime version="v2.0.50727" /> + <supportedRuntime version="v2.0.50215" /> + <supportedRuntime version="v2.0.40607" /> + <supportedRuntime version="v1.1.4322" /> + <supportedRuntime version="v1.0.3705" /> + + <requiredRuntime version="v1.0.3705" /> + </startup> + --> + + <!-- + The following <runtime> section allows running nunit under + .NET 1.0 by redirecting assemblies. The appliesTo attribute + causes the section to be ignored except under .NET 1.0version 1 + on a machine with only the .NET version 1.0 runtime installed. + If application and its tests were built for .NET 1.1 you will + also need to redirect system assemblies in the test config file. + --> + + <runtime> + + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" + appliesTo="v1.0.3705"> + + <dependentAssembly> + <assemblyIdentity name="System" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Data" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Drawing" + publicKeyToken="b03f5f7f11d50a3a" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Windows.Forms" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + <dependentAssembly> + <assemblyIdentity name="System.Xml" + publicKeyToken="b77a5c561934e089" + culture="neutral"/> + <bindingRedirect oldVersion="1.0.5000.0" + newVersion="1.0.3300.0"/> + </dependentAssembly> + + </assemblyBinding> + + </runtime> + +</configuration>
\ No newline at end of file |