457 files changed, 17657 insertions, 3481 deletions
diff --git a/.gitignore b/.gitignore
index d40b7d9a4f5..b4f491a3dd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 *.opt
 *.user
 *.res
+*.exp
 .gdb_history
 .DS_Store
 core
@@ -55,4 +56,7 @@ vcproj
 *.swp
 
 # OS X (Desktop Service Store)
-.DS_Store 
+.DS_Store
+cpp/SDKs
+cpp/demo/ipch
+cpp/demo/Debug
+\ No newline at end of file
diff --git a/CHANGES b/CHANGES
index aec2f6a7a02..448992f0577 100644
--- a/CHANGES
+++ b/CHANGES
@@ -32,6 +32,10 @@ General Changes
   batch failed because no servants could be found to dispatch the
   request.
 
+- Fixed issue where IceGrid round-robin load balancing policy returned
+  multiple times the same adapter endpoints if some IceGrid nodes were
+  down.
+
 - Fixed a bug where under certain circumstances, Ice could assert when
   a connection was being closed.
 
diff --git a/certs/c_dsa1024_priv.pem b/certs/c_dsa1024_priv.pem
index d57b1118a83..97f3dcefc5a 100644
--- a/certs/c_dsa1024_priv.pem
+++ b/certs/c_dsa1024_priv.pem
@@ -1,12 +1,12 @@
 -----BEGIN DSA PRIVATE KEY-----
-MIIBugIBAAKBgQDYxGfAeLV0HijE+9Xmb2wZjCTp+6yC+xdKPFTZT2q7wsqwbbMu
-zQy5AvAJEjq+GWaz3lml0BwT1wQTPaIJ/PIfZ+uyegQFkNlfIVXFfHuW7k3iDVHM
-Pba8OMeJ2fsKFMvkYlSmsM7ypSUyr4PH8zAV01bSCUT8SfzjOEMb3nRHOQIVAIf8
-0UPSn6AAHlWOi/zcUc0hZYodAoGABPHRNU583+N0HljQCenaGotjpqELl9nkJs0T
-b1sY7BL2sXRw4QQ6gLSyAmi0jXt/fhXs45FmW6uXpVWx25L97ChXvZAbC+FKv/10
-9qRNq1Jt+TYX2pLuKpGwbpwJOy8kg7i6OC1JlIBJV+viFwvtu2fG9+rV8dn7HkmH
-Y9Bj4bACgYALD8tq7BSKXVzAgpyQrT5AuQRQHnpIcTCIgrh+MHr8f2zVAzss3Qm8
-gqVAf3yQOdrIaxqKp0+G/lPnF3zFVn3aq40n3ZsGvC5I6QS69Dm0/ekGUTqn+WeU
-cHcm5/OmHUQfUtMoOddIuw69EX0lIqMANE2zPwrO1249C4rbJmNCkQIUfdT3UZrX
-OGIVAyfkx0+KEO6/ink=
+MIIBvAIBAAKBgQD2WPWwypx30b2xsEBf9i0fbPtDQIm3GP+OWpP+SMnTCGHPR/zL
+NDa6Ml4Zk9ZaDkhZ79pC38O36RmfFlYY1uhL1rvMR5rqehVTwE3QOr5vTg4l08AB
+2ldEc7f6l/3c2LVC2K2/ABbpPFtWNM9iZVzPu6AxUZPNdVnYC9mELslhnwIVAMYl
+50lU81xVf3FlJ2K8j5xh9c4XAoGAYFe2v0zI+za/fv3pVzR8VUE4AO3/g7KY4eoL
+gNPlE8WQ911YPKjdM/THs1N5PqyP2Ih/r0kMMbzw+jxpSeg9qXrTxoWEPJdbo998
+X4Sj0SvhlZH+FxXBQN0hLFT1aKUsfvZONggEGfQ7b3o6Ik7lLGtuom6/GiV79ckA
++uBMaR4CgYEAhMUafJc0GLPLyzwSCDTGfrBmjha5gyltLhG+pQV73BTStM/1bpRM
+kPPaqYlP9rktNEg4GUqQydUFA6I4Va4iarj+kNqwpX2vhuOnoa+GTK5HzaT2E5j2
+fxG4sO96BqbTjyNzXpkYoSATVKJK65zPCjDmYswRAsABZVRFpWNyK5sCFQCQkHgW
+52oR7UfezObkhDdgjTdOzw==
 -----END DSA PRIVATE KEY-----
diff --git a/certs/c_dsa1024_pub.pem b/certs/c_dsa1024_pub.pem
index c77654a667d..874791f383d 100644
--- a/certs/c_dsa1024_pub.pem
+++ b/certs/c_dsa1024_pub.pem
@@ -5,91 +5,91 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA/emailAddress=info@zeroc.com
         Validity
-            Not Before: Mar  8 00:14:59 2008 GMT
-            Not After : Mar  7 00:14:59 2013 GMT
+            Not Before: Jul  3 08:17:52 2012 GMT
+            Not After : Jul  2 08:17:52 2017 GMT
         Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client
         Subject Public Key Info:
             Public Key Algorithm: dsaEncryption
             DSA Public Key:
                 pub: 
-                    0b:0f:cb:6a:ec:14:8a:5d:5c:c0:82:9c:90:ad:3e:
-                    40:b9:04:50:1e:7a:48:71:30:88:82:b8:7e:30:7a:
-                    fc:7f:6c:d5:03:3b:2c:dd:09:bc:82:a5:40:7f:7c:
-                    90:39:da:c8:6b:1a:8a:a7:4f:86:fe:53:e7:17:7c:
-                    c5:56:7d:da:ab:8d:27:dd:9b:06:bc:2e:48:e9:04:
-                    ba:f4:39:b4:fd:e9:06:51:3a:a7:f9:67:94:70:77:
-                    26:e7:f3:a6:1d:44:1f:52:d3:28:39:d7:48:bb:0e:
-                    bd:11:7d:25:22:a3:00:34:4d:b3:3f:0a:ce:d7:6e:
-                    3d:0b:8a:db:26:63:42:91
+                    00:84:c5:1a:7c:97:34:18:b3:cb:cb:3c:12:08:34:
+                    c6:7e:b0:66:8e:16:b9:83:29:6d:2e:11:be:a5:05:
+                    7b:dc:14:d2:b4:cf:f5:6e:94:4c:90:f3:da:a9:89:
+                    4f:f6:b9:2d:34:48:38:19:4a:90:c9:d5:05:03:a2:
+                    38:55:ae:22:6a:b8:fe:90:da:b0:a5:7d:af:86:e3:
+                    a7:a1:af:86:4c:ae:47:cd:a4:f6:13:98:f6:7f:11:
+                    b8:b0:ef:7a:06:a6:d3:8f:23:73:5e:99:18:a1:20:
+                    13:54:a2:4a:eb:9c:cf:0a:30:e6:62:cc:11:02:c0:
+                    01:65:54:45:a5:63:72:2b:9b
                 P:   
-                    00:d8:c4:67:c0:78:b5:74:1e:28:c4:fb:d5:e6:6f:
-                    6c:19:8c:24:e9:fb:ac:82:fb:17:4a:3c:54:d9:4f:
-                    6a:bb:c2:ca:b0:6d:b3:2e:cd:0c:b9:02:f0:09:12:
-                    3a:be:19:66:b3:de:59:a5:d0:1c:13:d7:04:13:3d:
-                    a2:09:fc:f2:1f:67:eb:b2:7a:04:05:90:d9:5f:21:
-                    55:c5:7c:7b:96:ee:4d:e2:0d:51:cc:3d:b6:bc:38:
-                    c7:89:d9:fb:0a:14:cb:e4:62:54:a6:b0:ce:f2:a5:
-                    25:32:af:83:c7:f3:30:15:d3:56:d2:09:44:fc:49:
-                    fc:e3:38:43:1b:de:74:47:39
+                    00:f6:58:f5:b0:ca:9c:77:d1:bd:b1:b0:40:5f:f6:
+                    2d:1f:6c:fb:43:40:89:b7:18:ff:8e:5a:93:fe:48:
+                    c9:d3:08:61:cf:47:fc:cb:34:36:ba:32:5e:19:93:
+                    d6:5a:0e:48:59:ef:da:42:df:c3:b7:e9:19:9f:16:
+                    56:18:d6:e8:4b:d6:bb:cc:47:9a:ea:7a:15:53:c0:
+                    4d:d0:3a:be:6f:4e:0e:25:d3:c0:01:da:57:44:73:
+                    b7:fa:97:fd:dc:d8:b5:42:d8:ad:bf:00:16:e9:3c:
+                    5b:56:34:cf:62:65:5c:cf:bb:a0:31:51:93:cd:75:
+                    59:d8:0b:d9:84:2e:c9:61:9f
                 Q:   
-                    00:87:fc:d1:43:d2:9f:a0:00:1e:55:8e:8b:fc:dc:
-                    51:cd:21:65:8a:1d
+                    00:c6:25:e7:49:54:f3:5c:55:7f:71:65:27:62:bc:
+                    8f:9c:61:f5:ce:17
                 G:   
-                    04:f1:d1:35:4e:7c:df:e3:74:1e:58:d0:09:e9:da:
-                    1a:8b:63:a6:a1:0b:97:d9:e4:26:cd:13:6f:5b:18:
-                    ec:12:f6:b1:74:70:e1:04:3a:80:b4:b2:02:68:b4:
-                    8d:7b:7f:7e:15:ec:e3:91:66:5b:ab:97:a5:55:b1:
-                    db:92:fd:ec:28:57:bd:90:1b:0b:e1:4a:bf:fd:74:
-                    f6:a4:4d:ab:52:6d:f9:36:17:da:92:ee:2a:91:b0:
-                    6e:9c:09:3b:2f:24:83:b8:ba:38:2d:49:94:80:49:
-                    57:eb:e2:17:0b:ed:bb:67:c6:f7:ea:d5:f1:d9:fb:
-                    1e:49:87:63:d0:63:e1:b0
+                    60:57:b6:bf:4c:c8:fb:36:bf:7e:fd:e9:57:34:7c:
+                    55:41:38:00:ed:ff:83:b2:98:e1:ea:0b:80:d3:e5:
+                    13:c5:90:f7:5d:58:3c:a8:dd:33:f4:c7:b3:53:79:
+                    3e:ac:8f:d8:88:7f:af:49:0c:31:bc:f0:fa:3c:69:
+                    49:e8:3d:a9:7a:d3:c6:85:84:3c:97:5b:a3:df:7c:
+                    5f:84:a3:d1:2b:e1:95:91:fe:17:15:c1:40:dd:21:
+                    2c:54:f5:68:a5:2c:7e:f6:4e:36:08:04:19:f4:3b:
+                    6f:7a:3a:22:4e:e5:2c:6b:6e:a2:6e:bf:1a:25:7b:
+                    f5:c9:00:fa:e0:4c:69:1e
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                43:5D:F4:DA:DA:EC:26:B0:05:85:06:3E:76:FD:9D:FF:F2:FE:70:26
+                4B:00:79:3C:5A:9E:EB:85:82:2F:29:DA:D1:50:95:64:EE:FF:76:F8
             X509v3 Authority Key Identifier: 
-                keyid:98:47:F1:08:3C:55:3F:B6:A7:BC:62:C6:02:12:85:8F:BD:96:19:BA
+                keyid:8A:AE:B4:AA:C5:54:D5:CE:D0:6A:0C:FF:3D:83:8C:60:B4:AD:70:DB
                 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA/emailAddress=info@zeroc.com
-                serial:ED:07:45:CD:BD:7D:29:F0
+                serial:DB:C1:07:84:72:86:C9:56
 
             X509v3 Subject Alternative Name: 
                 DNS:client, IP Address:127.0.0.1
     Signature Algorithm: md5WithRSAEncryption
-        38:87:21:2f:b0:7b:43:c6:09:af:05:32:e9:e3:7c:c4:08:b9:
-        60:2d:5d:16:6b:51:54:5f:bf:53:0c:62:05:dd:f2:9c:7f:0b:
-        60:12:7a:7d:e3:df:ad:e7:32:dd:7b:73:f4:26:7e:da:5a:21:
-        15:5c:0e:93:de:97:43:e6:03:7c:92:1a:f3:b1:87:92:90:a5:
-        c5:1b:7a:5b:53:73:bc:ee:e2:41:5c:d6:0b:04:e5:14:55:d7:
-        c0:01:d2:42:65:02:20:de:bf:57:fb:93:2c:c8:1b:78:23:af:
-        42:ab:93:84:7a:86:2a:d2:47:3f:40:34:e0:8d:d1:0c:94:db:
-        51:1d
+        57:3d:8c:cc:aa:f2:8e:8f:04:78:f7:9d:61:36:4e:2c:d0:a3:
+        bb:aa:95:a6:f8:0b:c1:a7:f8:fe:af:cf:f7:2c:02:5e:d3:f5:
+        a7:a7:8a:8a:98:c1:0b:63:dc:9f:d7:6f:86:eb:c4:2f:df:85:
+        c2:9c:ef:b5:3a:d7:96:cc:32:6c:ad:a7:db:f3:a1:3e:a7:a9:
+        61:91:2b:8d:37:4f:4e:ca:df:ce:f3:11:c8:f6:bc:5e:35:67:
+        7b:b0:2f:7c:9e:59:0d:cc:71:29:cd:95:96:00:55:d8:1b:fb:
+        39:76:d9:93:fe:f9:41:28:ec:37:9a:37:98:eb:cc:88:f2:65:
+        d2:4d
 -----BEGIN CERTIFICATE-----
-MIIEsTCCBBqgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
+MIIEsjCCBBugAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
 EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU
 MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVy
-b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMDgw
-MzA4MDAxNDU5WhcNMTMwMzA3MDAxNDU5WjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
+b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTIw
+NzAzMDgxNzUyWhcNMTcwNzAyMDgxNzUyWjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
 CBMHRmxvcmlkYTEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEd
 MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xDzANBgNVBAMTBkNsaWVudDCC
-AbYwggErBgcqhkjOOAQBMIIBHgKBgQDYxGfAeLV0HijE+9Xmb2wZjCTp+6yC+xdK
-PFTZT2q7wsqwbbMuzQy5AvAJEjq+GWaz3lml0BwT1wQTPaIJ/PIfZ+uyegQFkNlf
-IVXFfHuW7k3iDVHMPba8OMeJ2fsKFMvkYlSmsM7ypSUyr4PH8zAV01bSCUT8Sfzj
-OEMb3nRHOQIVAIf80UPSn6AAHlWOi/zcUc0hZYodAoGABPHRNU583+N0HljQCena
-GotjpqELl9nkJs0Tb1sY7BL2sXRw4QQ6gLSyAmi0jXt/fhXs45FmW6uXpVWx25L9
-7ChXvZAbC+FKv/109qRNq1Jt+TYX2pLuKpGwbpwJOy8kg7i6OC1JlIBJV+viFwvt
-u2fG9+rV8dn7HkmHY9Bj4bADgYQAAoGACw/LauwUil1cwIKckK0+QLkEUB56SHEw
-iIK4fjB6/H9s1QM7LN0JvIKlQH98kDnayGsaiqdPhv5T5xd8xVZ92quNJ92bBrwu
-SOkEuvQ5tP3pBlE6p/lnlHB3Jufzph1EH1LTKDnXSLsOvRF9JSKjADRNsz8Kztdu
-PQuK2yZjQpGjggEWMIIBEjAJBgNVHRMEAjAAMB0GA1UdDgQWBBRDXfTa2uwmsAWF
-Bj52/Z3/8v5wJjCBzAYDVR0jBIHEMIHBgBSYR/EIPFU/tqe8YsYCEoWPvZYZuqGB
-naSBmjCBlzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcT
-ElBhbG0gQmVhY2ggR2FyZGVuczEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNV
-BAsTA0ljZTEWMBQGA1UEAxMNWmVyb0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYO
-aW5mb0B6ZXJvYy5jb22CCQDtB0XNvX0p8DAXBgNVHREEEDAOggZjbGllbnSHBH8A
-AAEwDQYJKoZIhvcNAQEEBQADgYEAOIchL7B7Q8YJrwUy6eN8xAi5YC1dFmtRVF+/
-UwxiBd3ynH8LYBJ6fePfrecy3Xtz9CZ+2lohFVwOk96XQ+YDfJIa87GHkpClxRt6
-W1NzvO7iQVzWCwTlFFXXwAHSQmUCIN6/V/uTLMgbeCOvQquThHqGKtJHP0A04I3R
-DJTbUR0=
+AbcwggErBgcqhkjOOAQBMIIBHgKBgQD2WPWwypx30b2xsEBf9i0fbPtDQIm3GP+O
+WpP+SMnTCGHPR/zLNDa6Ml4Zk9ZaDkhZ79pC38O36RmfFlYY1uhL1rvMR5rqehVT
+wE3QOr5vTg4l08AB2ldEc7f6l/3c2LVC2K2/ABbpPFtWNM9iZVzPu6AxUZPNdVnY
+C9mELslhnwIVAMYl50lU81xVf3FlJ2K8j5xh9c4XAoGAYFe2v0zI+za/fv3pVzR8
+VUE4AO3/g7KY4eoLgNPlE8WQ911YPKjdM/THs1N5PqyP2Ih/r0kMMbzw+jxpSeg9
+qXrTxoWEPJdbo998X4Sj0SvhlZH+FxXBQN0hLFT1aKUsfvZONggEGfQ7b3o6Ik7l
+LGtuom6/GiV79ckA+uBMaR4DgYUAAoGBAITFGnyXNBizy8s8Egg0xn6wZo4WuYMp
+bS4RvqUFe9wU0rTP9W6UTJDz2qmJT/a5LTRIOBlKkMnVBQOiOFWuImq4/pDasKV9
+r4bjp6GvhkyuR82k9hOY9n8RuLDvegam048jc16ZGKEgE1SiSuuczwow5mLMEQLA
+AWVURaVjciubo4IBFjCCARIwCQYDVR0TBAIwADAdBgNVHQ4EFgQUSwB5PFqe64WC
+Lyna0VCVZO7/dvgwgcwGA1UdIwSBxDCBwYAUiq60qsVU1c7Qagz/PYOMYLStcNuh
+gZ2kgZowgZcxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRhMRswGQYDVQQH
+ExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJbmMuMQwwCgYD
+VQQLEwNJY2UxFjAUBgNVBAMTDVplcm9DIFRlc3QgQ0ExHTAbBgkqhkiG9w0BCQEW
+DmluZm9AemVyb2MuY29tggkA28EHhHKGyVYwFwYDVR0RBBAwDoIGY2xpZW50hwR/
+AAABMA0GCSqGSIb3DQEBBAUAA4GBAFc9jMyq8o6PBHj3nWE2TizQo7uqlab4C8Gn
++P6vz/csAl7T9aenioqYwQtj3J/Xb4brxC/fhcKc77U615bMMmytp9vzoT6nqWGR
+K403T07K387zEcj2vF41Z3uwL3yeWQ3McSnNlZYAVdgb+zl22ZP++UEo7DeaN5jr
+zIjyZdJN
 -----END CERTIFICATE-----
diff --git a/certs/c_rsa1024.pfx b/certs/c_rsa1024.pfx
index a407cad62e2..3f74828cf51 100644
--- a/certs/c_rsa1024.pfx
+++ b/certs/c_rsa1024.pfx
diff --git a/certs/c_rsa1024_priv.pem b/certs/c_rsa1024_priv.pem
index 6f0e4c90860..ef7a8730dcc 100644
--- a/certs/c_rsa1024_priv.pem
+++ b/certs/c_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDigEeILeDorS3VO0Angw0dSmpNTXvlVSWLcYxXMF+5A5bW9zkc
-5/JDAfR4w5s0ZhqjWy2xrup3ChvgRwxcCA+v2Y/ydc7DkAqPbO45TaLxiad6AZmZ
-TdFCCmGGhdWhgk4zgMoCboNg2vDAqfcMyHWikyxdcS810rUaVuOFE+9DMwIDAQAB
-AoGAco8FHvhtZ+Gna9Di+tkKugTYTS7iejSdn7CXlcWutIn/Mcyqw1cBLij/+FCe
-4FrAIF1OeC8LAZhITyBAPRAKtifErwbuSpWpd4jPyJF8MV1f0scZR2uiDGN21w0V
-5vYq66RZ+RBqeDtsDSWnZ5Jrsfvft8lHc1axVW9KvnWtgbkCQQD2EmvbiLVuJi3o
-sFtwBOwkuKWNYuhmYkIymYuh0TN3wpAkaBmVgiNe0UQYI5gw3/DhPFltHF4hpJRv
-kkiIH5WfAkEA66O37QB3JwcSZ+0SVbjgLf0jx33+vSVGGL0v0XN/FfAkKHpdmoUv
-gbpS95kDL7ixQhfG9tmGLCa56BaYrC/h7QJBAMrXHo/GHoCg+kEQdx9c/2e5ycZF
-nPsgzh610ZNfRsTW3kkUgtpqf0uexzn6xW6sevy/6Zt2weWLrExYUm/bUVMCQA6v
-ISMPyF0SP79iMqZM4wt6nuQrodg/nmKkR3qR6/V+BYLQPU0Hx7IZ3lm3m085/zHT
-MX7oh0fxEdy4q8LvKPECQQDB1m2jTzvOpDp3Dnwp0G/M3BQ623zDlaGi+czPaN5E
-UNlr5kXZ7sPnu9Xy2I0yMvvGAO13GV7Vtrs0QM5yem2P
+MIICWwIBAAKBgQDXZY1zyziQB7yQVxuKVMFieapv9HlxyVIlo4CuVvzeUP+jHo+U
+GtUrVR1RhekHC1GnC84lE0Nv6c5HHJriAauBtQdli6UInU00xKQQuAZn5RRFcO+j
+JnlNilgHAAQc/NKorx9V73W0uQbZyXcfBx/i52G7k6TcPK7o6LNjjEnj5wIDAQAB
+AoGAUAAK0ogXIP+OnHmN5AnorX+MuvotJQLl/M7GW3o5fwTMfbQ7FYIFzItXUVEQ
+JKqikA2FaiXGdUl8cNMB/5EpNlwsGbJaiQhNQeihGTXbzvcPgX+CjQxdWXdUaxW0
+DM/f2Fi1cFub3gcATS0PpuJXkmr2JHzoIxZghlzzq1Fzj4kCQQDrwvZn0MFy2fzg
+Sx3nstZluxgMeFuZCa5tePjdGlTCQ5Uc+v26B6FjxkRHnRD3d774R2qBtXoB8F+w
+e8Z1v1o7AkEA6eMOc0Nw68OplaA5uK75uYDylyXheRzPhDcBqWKZRSSQ64JYzsTW
+BNg1iJ29OctoPOHjEd2L6hTHso2prQiWRQJAJsEsqhIZypxkwiX264BtV9mycVJT
+lEuQHbS2C/ppFmnvmAz2Kl9Yu0L7NF5wTI2lmcB7lIjVXn457JPcIrzqwwJAfn+1
+8xWI35tF/41XatIIcxKRIrr0RkMU4de2aFzRtRnf3+DyE3NWpewimC9ohvfC+xrZ
+a3I+GG8Ay0vfd5zrWQJAbGIyikI4lr6ngM+WkWhUdGPQiv1vbHMjxCYBYd21hg3c
+xeHIE0MKLPTBX0NCgIsISomWmBBdzwFTdzpkml4RMw==
 -----END RSA PRIVATE KEY-----
diff --git a/certs/c_rsa1024_pub.pem b/certs/c_rsa1024_pub.pem
index 300e2657e35..cc336b5aabb 100644
--- a/certs/c_rsa1024_pub.pem
+++ b/certs/c_rsa1024_pub.pem
@@ -5,63 +5,63 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA/emailAddress=info@zeroc.com
         Validity
-            Not Before: Mar  8 00:14:58 2008 GMT
-            Not After : Mar  7 00:14:58 2013 GMT
+            Not Before: Jul  3 08:17:52 2012 GMT
+            Not After : Jul  2 08:17:52 2017 GMT
         Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:e2:80:47:88:2d:e0:e8:ad:2d:d5:3b:40:27:83:
-                    0d:1d:4a:6a:4d:4d:7b:e5:55:25:8b:71:8c:57:30:
-                    5f:b9:03:96:d6:f7:39:1c:e7:f2:43:01:f4:78:c3:
-                    9b:34:66:1a:a3:5b:2d:b1:ae:ea:77:0a:1b:e0:47:
-                    0c:5c:08:0f:af:d9:8f:f2:75:ce:c3:90:0a:8f:6c:
-                    ee:39:4d:a2:f1:89:a7:7a:01:99:99:4d:d1:42:0a:
-                    61:86:85:d5:a1:82:4e:33:80:ca:02:6e:83:60:da:
-                    f0:c0:a9:f7:0c:c8:75:a2:93:2c:5d:71:2f:35:d2:
-                    b5:1a:56:e3:85:13:ef:43:33
+                    00:d7:65:8d:73:cb:38:90:07:bc:90:57:1b:8a:54:
+                    c1:62:79:aa:6f:f4:79:71:c9:52:25:a3:80:ae:56:
+                    fc:de:50:ff:a3:1e:8f:94:1a:d5:2b:55:1d:51:85:
+                    e9:07:0b:51:a7:0b:ce:25:13:43:6f:e9:ce:47:1c:
+                    9a:e2:01:ab:81:b5:07:65:8b:a5:08:9d:4d:34:c4:
+                    a4:10:b8:06:67:e5:14:45:70:ef:a3:26:79:4d:8a:
+                    58:07:00:04:1c:fc:d2:a8:af:1f:55:ef:75:b4:b9:
+                    06:d9:c9:77:1f:07:1f:e2:e7:61:bb:93:a4:dc:3c:
+                    ae:e8:e8:b3:63:8c:49:e3:e7
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                0A:97:F9:3F:25:F7:B0:95:EF:E1:40:D1:CC:59:05:4C:4D:83:17:00
+                50:BC:46:71:D4:EF:49:02:5E:1D:39:9A:22:7A:18:13:2A:72:A3:07
             X509v3 Authority Key Identifier: 
-                keyid:98:47:F1:08:3C:55:3F:B6:A7:BC:62:C6:02:12:85:8F:BD:96:19:BA
+                keyid:8A:AE:B4:AA:C5:54:D5:CE:D0:6A:0C:FF:3D:83:8C:60:B4:AD:70:DB
                 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA/emailAddress=info@zeroc.com
-                serial:ED:07:45:CD:BD:7D:29:F0
+                serial:DB:C1:07:84:72:86:C9:56
 
             X509v3 Subject Alternative Name: 
                 DNS:client, IP Address:127.0.0.1
     Signature Algorithm: md5WithRSAEncryption
-        5c:5d:32:aa:1a:65:da:6d:31:19:f1:da:ca:b8:ec:5e:1b:d6:
-        f3:27:6d:6f:c7:87:95:37:05:e3:61:33:aa:ee:47:3f:2c:16:
-        6a:70:1b:20:72:64:d5:a4:44:76:eb:ff:02:97:c9:4f:9b:9a:
-        d9:07:f7:11:e0:50:8b:d4:63:d0:97:83:62:e4:cf:a2:6c:b5:
-        0e:51:eb:a2:0b:af:84:aa:22:fd:be:1e:2a:4c:33:02:96:d0:
-        fe:27:69:b6:27:74:1c:3d:84:4c:c1:2f:3a:18:1c:2f:d8:41:
-        6c:52:c9:a0:50:d4:e1:7b:63:9f:b4:8f:4d:55:13:1f:b8:a5:
-        1b:0c
+        68:0c:45:5f:6c:7f:63:24:8a:79:72:b4:52:bf:47:de:a2:5c:
+        65:9e:c3:b8:03:ac:b6:52:b4:57:73:a7:e0:36:b3:09:29:84:
+        65:a3:ea:be:85:b5:2f:36:46:4e:ed:e1:92:92:50:5b:c7:ad:
+        1e:d8:0d:81:4f:3d:9e:52:cb:b4:e5:e1:1e:26:44:8a:b2:ac:
+        f6:8b:29:f5:f8:57:3c:6a:0c:43:a5:4d:b9:f2:48:03:e1:00:
+        3b:83:e8:a8:8b:21:c4:50:32:80:04:89:e2:7c:20:a6:03:0d:
+        87:41:16:cc:b0:35:a4:20:61:ee:e0:f2:ea:11:8c:e8:58:9a:
+        78:49
 -----BEGIN CERTIFICATE-----
 MIIDmTCCAwKgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
 EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU
 MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVy
-b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMDgw
-MzA4MDAxNDU4WhcNMTMwMzA3MDAxNDU4WjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
+b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTIw
+NzAzMDgxNzUyWhcNMTcwNzAyMDgxNzUyWjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
 CBMHRmxvcmlkYTEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEd
 MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xDzANBgNVBAMTBkNsaWVudDCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4oBHiC3g6K0t1TtAJ4MNHUpqTU17
-5VUli3GMVzBfuQOW1vc5HOfyQwH0eMObNGYao1stsa7qdwob4EcMXAgPr9mP8nXO
-w5AKj2zuOU2i8YmnegGZmU3RQgphhoXVoYJOM4DKAm6DYNrwwKn3DMh1opMsXXEv
-NdK1GlbjhRPvQzMCAwEAAaOCARYwggESMAkGA1UdEwQCMAAwHQYDVR0OBBYEFAqX
-+T8l97CV7+FA0cxZBUxNgxcAMIHMBgNVHSMEgcQwgcGAFJhH8Qg8VT+2p7xixgIS
-hY+9lhm6oYGdpIGaMIGXMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEb
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA12WNc8s4kAe8kFcbilTBYnmqb/R5
+cclSJaOArlb83lD/ox6PlBrVK1UdUYXpBwtRpwvOJRNDb+nORxya4gGrgbUHZYul
+CJ1NNMSkELgGZ+UURXDvoyZ5TYpYBwAEHPzSqK8fVe91tLkG2cl3Hwcf4udhu5Ok
+3Dyu6OizY4xJ4+cCAwEAAaOCARYwggESMAkGA1UdEwQCMAAwHQYDVR0OBBYEFFC8
+RnHU70kCXh05miJ6GBMqcqMHMIHMBgNVHSMEgcQwgcGAFIqutKrFVNXO0GoM/z2D
+jGC0rXDboYGdpIGaMIGXMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEb
 MBkGA1UEBxMSUGFsbSBCZWFjaCBHYXJkZW5zMRQwEgYDVQQKEwtaZXJvQywgSW5j
 LjEMMAoGA1UECxMDSWNlMRYwFAYDVQQDEw1aZXJvQyBUZXN0IENBMR0wGwYJKoZI
-hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAO0HRc29fSnwMBcGA1UdEQQQMA6CBmNs
-aWVudIcEfwAAATANBgkqhkiG9w0BAQQFAAOBgQBcXTKqGmXabTEZ8drKuOxeG9bz
-J21vx4eVNwXjYTOq7kc/LBZqcBsgcmTVpER26/8Cl8lPm5rZB/cR4FCL1GPQl4Ni
-5M+ibLUOUeuiC6+EqiL9vh4qTDMCltD+J2m2J3QcPYRMwS86GBwv2EFsUsmgUNTh
-e2OftI9NVRMfuKUbDA==
+hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJANvBB4RyhslWMBcGA1UdEQQQMA6CBmNs
+aWVudIcEfwAAATANBgkqhkiG9w0BAQQFAAOBgQBoDEVfbH9jJIp5crRSv0feolxl
+nsO4A6y2UrRXc6fgNrMJKYRlo+q+hbUvNkZO7eGSklBbx60e2A2BTz2eUsu05eEe
+JkSKsqz2iyn1+Fc8agxDpU258kgD4QA7g+ioiyHEUDKABInifCCmAw2HQRbMsDWk
+IGHu4PLqEYzoWJp4SQ==
 -----END CERTIFICATE-----
diff --git a/certs/cacert.pem b/certs/cacert.pem
index 5fd7a81c727..f30e07c1562 100644
--- a/certs/cacert.pem
+++ b/certs/cacert.pem
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDrjCCAxegAwIBAgIJAO0HRc29fSnwMA0GCSqGSIb3DQEBBAUAMIGXMQswCQYD
+MIIDrjCCAxegAwIBAgIJANvBB4RyhslWMA0GCSqGSIb3DQEBBAUAMIGXMQswCQYD
 VQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEbMBkGA1UEBxMSUGFsbSBCZWFjaCBH
 YXJkZW5zMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNlMRYwFAYD
 VQQDEw1aZXJvQyBUZXN0IENBMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNv
-bTAeFw0wODAzMDgwMDE0NThaFw0xMzAzMDcwMDE0NThaMIGXMQswCQYDVQQGEwJV
+bTAeFw0xMjA3MDMwODE3NTFaFw0xNzA3MDIwODE3NTFaMIGXMQswCQYDVQQGEwJV
 UzEQMA4GA1UECBMHRmxvcmlkYTEbMBkGA1UEBxMSUGFsbSBCZWFjaCBHYXJkZW5z
 MRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNlMRYwFAYDVQQDEw1a
 ZXJvQyBUZXN0IENBMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqPR7kypYI4vtXrZnDkWNEng+WPrtrRXZ
-MP5bORomRQ4o/wborZstUZGfXAv9tlJERBTfD/o6AsWW1Ip+qPQObFTHkjL9i1xT
-Rp6uxuT/y/X2wleSdNqIeLUueoggL5DJPwk+AtvHItiwgEAA/cBCrg/wZKPuaav3
-ZIvIGuHIOpMCAwEAAaOB/zCB/DAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSYR/EI
-PFU/tqe8YsYCEoWPvZYZujCBzAYDVR0jBIHEMIHBgBSYR/EIPFU/tqe8YsYCEoWP
-vZYZuqGBnaSBmjCBlzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZ
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAy69qQ8d7APyRKJhuLimVNfdcq5weonqE
+nfEVYCfE69hMASMiNmAc1iG2os7yaU+pCkBVLKlEKBMB5yTYM1RoE547U8Dkn6F6
+ARQ4uq/7etrVfuY+CJIvYC+uTuNXOC28iP5ENtv+XzQlvxUiFenRQwcPdUgQsFfD
+Rs0kcvI+BdcCAwEAAaOB/zCB/DAMBgNVHRMEBTADAQH/MB0GA1UdDgQWBBSKrrSq
+xVTVztBqDP89g4xgtK1w2zCBzAYDVR0jBIHEMIHBgBSKrrSqxVTVztBqDP89g4xg
+tK1w26GBnaSBmjCBlzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZ
 BgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEUMBIGA1UEChMLWmVyb0MsIEluYy4x
 DDAKBgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVyb0MgVGVzdCBDQTEdMBsGCSqGSIb3
-DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDtB0XNvX0p8DANBgkqhkiG9w0BAQQFAAOB
-gQAiYJPZabe7v2LwocBgROUipgaGBrN226Sp8Kr0W1G0IbNnCJkyS15F0h9aIMyG
-7WiZTPelrzh5I0HcnM0YWzzPaYq53Q75RQU89ZPVsCXTM4PFHy4wDqCsiwuSCKlC
-6kZi8N3mT95tQGyiSlMPi2cpcp9C+hB0MA5TL3j8ej2yXQ==
+DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDbwQeEcobJVjANBgkqhkiG9w0BAQQFAAOB
+gQCmmoql51g+NJmzygDAfQavsEGMM2dkVsHoEpp1tcX7Iaaq+sxye3r5bPC3C+za
++f8YIAEJwz+M3EIGWP2kYoEVz6KmppfcgQXdTVjn8CkoV/wCIXbLse07fb57rDZj
+GezqZNHal6bDzrqKAe0YBMvBcDdrYD7kENLuWJkkpq8i8g==
 -----END CERTIFICATE-----
diff --git a/certs/cakey.pem b/certs/cakey.pem
index fa30a5b1af5..c04b82e8ae4 100644
--- a/certs/cakey.pem
+++ b/certs/cakey.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCo9HuTKlgji+1etmcORY0SeD5Y+u2tFdkw/ls5GiZFDij/Buit
-my1RkZ9cC/22UkREFN8P+joCxZbUin6o9A5sVMeSMv2LXFNGnq7G5P/L9fbCV5J0
-2oh4tS56iCAvkMk/CT4C28ci2LCAQAD9wEKuD/Bko+5pq/dki8ga4cg6kwIDAQAB
-AoGASkcRfOWE0jvWI2l1bSTOnGwYnO3UR9/vGEb6u+PvJzTOeTAEYy5xggbPVJxA
-8kLAmF3EozWTA1zyroYkoQqKvAaQxr3vXVQ278JfoLOl4bMbzwsfJewFUvJhZTai
-0jPPNpr3VwXc1JYBi/wrdtgCskNxBVKHA/7Lvu8l43IU9+ECQQDZJQy1u7cVYdU2
-4gkaDWpwRfz3L0OKYiwGwgJDkstkRO2r4HAli24h3UFvphaSfRnLrsujjrIMj5oI
-igB6gzqtAkEAxy/2RYKylpZsYfDlACn0Z0EVNeWVFVYca20mD889qO60kzpevZdq
-Mg/A6c6h6h/C6aI55f/pnMcYkeniUgMyPwJAGOSXbWoElg3uHGmTM4pgLljHpCql
-6oJQm8G38rksWeVQ/cgv8w3l5TnxG3SF1+tBfskeDTT5klkQBnSTk3fhzQJAEygi
-uFa0lFUNQXIopBZk4hVZU+CrsOyiORa7RWP6GygyB8LiX7uTRBNNy27LFbhOR6gJ
-h3xQXHqte0MSOC8EgwJBALC0miqIZVtZQWqN/KKXiyWlG1718L222QQt8YFAydz9
-1pobTLn9ENx+ESQg1cDBQtUYZO72kDj3jdRLdUfwk9U=
+MIICXQIBAAKBgQDLr2pDx3sA/JEomG4uKZU191yrnB6ieoSd8RVgJ8Tr2EwBIyI2
+YBzWIbaizvJpT6kKQFUsqUQoEwHnJNgzVGgTnjtTwOSfoXoBFDi6r/t62tV+5j4I
+ki9gL65O41c4LbyI/kQ22/5fNCW/FSIV6dFDBw91SBCwV8NGzSRy8j4F1wIDAQAB
+AoGAUnqDw1KBopKjjRa8dwDrpOC3q94aIZ0PGo3HJBq2iPIbRNKfRfmBc8xPEnpO
+ewqA3t/SHbWlHb0kph6rVY22XpF25evUMdsq3w3YWG1vJJu61KebKgWdbGpQut9A
+L//nHlBXcF/aqWmRaf7Ng4W1GIWGJQfaxuSYJSYrixRIs2ECQQD8VEnacsMeXhQC
+75LRbRKC+63O91vYrSCjHl96iWxQXxfXOkB8dxbGPn6DoisALvIiT3w7xGYiKEi4
+IMzuF3TfAkEAzqX4EPwjUu1eo5dPNcjTn6VV+j3hcfTAn1LIsDd4yazem36QG3jD
+JoLMHPliP3aJqsl6ntS0QBJSnxGkqthWCQJBAMcubgH/d2CAWQGcReQFWoiEzUXD
+4v+eYlYBAtOCqTqkZfhipkbZ5uNkr4+PMqx5Ym+NGP9A4HJ0JDscwUfswjcCQQCq
+otmoDMuOWntfUj4SB3bXyMqqDBbw5k14Qf99oxCWV6ypcWTFin56el7ZPgQmq1ca
+M6yRIsqEbZzTxNnYSTMhAkBjWqLd1anOTg+1X71F2ziF3gI8Eg+MgaDmoe5JVk3Y
+JrwulCI6s8MRucCpbjjaufpBMeEPrFVLlCWGUSSb//73
 -----END RSA PRIVATE KEY-----
diff --git a/certs/certs.jks b/certs/certs.jks
index 99bec93bdd9..4cd67cc7f23 100644
--- a/certs/certs.jks
+++ b/certs/certs.jks
diff --git a/certs/client.jks b/certs/client.jks
index 8ad7b2cea0e..5a3f012990d 100644
--- a/certs/client.jks
+++ b/certs/client.jks
diff --git a/certs/dsaparam1024.pem b/certs/dsaparam1024.pem
index a60f818cf8a..23194dec102 100644
--- a/certs/dsaparam1024.pem
+++ b/certs/dsaparam1024.pem
@@ -1,9 +1,9 @@
 -----BEGIN DSA PARAMETERS-----
-MIIBHgKBgQDYxGfAeLV0HijE+9Xmb2wZjCTp+6yC+xdKPFTZT2q7wsqwbbMuzQy5
-AvAJEjq+GWaz3lml0BwT1wQTPaIJ/PIfZ+uyegQFkNlfIVXFfHuW7k3iDVHMPba8
-OMeJ2fsKFMvkYlSmsM7ypSUyr4PH8zAV01bSCUT8SfzjOEMb3nRHOQIVAIf80UPS
-n6AAHlWOi/zcUc0hZYodAoGABPHRNU583+N0HljQCenaGotjpqELl9nkJs0Tb1sY
-7BL2sXRw4QQ6gLSyAmi0jXt/fhXs45FmW6uXpVWx25L97ChXvZAbC+FKv/109qRN
-q1Jt+TYX2pLuKpGwbpwJOy8kg7i6OC1JlIBJV+viFwvtu2fG9+rV8dn7HkmHY9Bj
-4bA=
+MIIBHgKBgQD2WPWwypx30b2xsEBf9i0fbPtDQIm3GP+OWpP+SMnTCGHPR/zLNDa6
+Ml4Zk9ZaDkhZ79pC38O36RmfFlYY1uhL1rvMR5rqehVTwE3QOr5vTg4l08AB2ldE
+c7f6l/3c2LVC2K2/ABbpPFtWNM9iZVzPu6AxUZPNdVnYC9mELslhnwIVAMYl50lU
+81xVf3FlJ2K8j5xh9c4XAoGAYFe2v0zI+za/fv3pVzR8VUE4AO3/g7KY4eoLgNPl
+E8WQ911YPKjdM/THs1N5PqyP2Ih/r0kMMbzw+jxpSeg9qXrTxoWEPJdbo998X4Sj
+0SvhlZH+FxXBQN0hLFT1aKUsfvZONggEGfQ7b3o6Ik7lLGtuom6/GiV79ckA+uBM
+aR4=
 -----END DSA PARAMETERS-----
diff --git a/certs/openssl/server.cnf b/certs/openssl/server.cnf
index 29479a177e0..4b9a7d51fa3 100644
--- a/certs/openssl/server.cnf
+++ b/certs/openssl/server.cnf
@@ -54,7 +54,7 @@ basicConstraints = CA:false
 subjectKeyIdentifier = hash
 authorityKeyIdentifier = keyid:always,issuer:always
 
-subjectAltName = DNS:server, IP:127.0.0.1
+subjectAltName = DNS:127.0.0.1, IP:127.0.0.1
 
 [ req ]
 default_bits        = 1024
@@ -71,7 +71,7 @@ stateOrProvinceName    = Florida
 localityName           = Palm Beach Gardens
 organizationName       = ZeroC, Inc.
 organizationalUnitName = Ice
-commonName             = Server
+commonName             = 127.0.0.1
 emailAddress           = info@zeroc.com
 
 
diff --git a/certs/s_dsa1024_priv.pem b/certs/s_dsa1024_priv.pem
index 1377654f5ed..74def66dee5 100644
--- a/certs/s_dsa1024_priv.pem
+++ b/certs/s_dsa1024_priv.pem
@@ -1,12 +1,12 @@
 -----BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQDYxGfAeLV0HijE+9Xmb2wZjCTp+6yC+xdKPFTZT2q7wsqwbbMu
-zQy5AvAJEjq+GWaz3lml0BwT1wQTPaIJ/PIfZ+uyegQFkNlfIVXFfHuW7k3iDVHM
-Pba8OMeJ2fsKFMvkYlSmsM7ypSUyr4PH8zAV01bSCUT8SfzjOEMb3nRHOQIVAIf8
-0UPSn6AAHlWOi/zcUc0hZYodAoGABPHRNU583+N0HljQCenaGotjpqELl9nkJs0T
-b1sY7BL2sXRw4QQ6gLSyAmi0jXt/fhXs45FmW6uXpVWx25L97ChXvZAbC+FKv/10
-9qRNq1Jt+TYX2pLuKpGwbpwJOy8kg7i6OC1JlIBJV+viFwvtu2fG9+rV8dn7HkmH
-Y9Bj4bACgYEAvnISnxJdR7OewHeOjHJfVzo1oeTN65gRMfoXW6YpY+QqQ7Lc3Oj4
-hJ0cnOWFLBA/NHvkA3JVUhQ28lxFoZiMhkgdyIJchUykLF8yVLnkAYqjoWcUlZ2h
-RDIoq/J2VUsuFna4AmbQD/CfGLIUm2y7SsDd65BC6JSU8e97qE+8sJUCFH6ZWJoJ
-medPrVHE598PVn1s/d48
+MIIBuwIBAAKBgQD2WPWwypx30b2xsEBf9i0fbPtDQIm3GP+OWpP+SMnTCGHPR/zL
+NDa6Ml4Zk9ZaDkhZ79pC38O36RmfFlYY1uhL1rvMR5rqehVTwE3QOr5vTg4l08AB
+2ldEc7f6l/3c2LVC2K2/ABbpPFtWNM9iZVzPu6AxUZPNdVnYC9mELslhnwIVAMYl
+50lU81xVf3FlJ2K8j5xh9c4XAoGAYFe2v0zI+za/fv3pVzR8VUE4AO3/g7KY4eoL
+gNPlE8WQ911YPKjdM/THs1N5PqyP2Ih/r0kMMbzw+jxpSeg9qXrTxoWEPJdbo998
+X4Sj0SvhlZH+FxXBQN0hLFT1aKUsfvZONggEGfQ7b3o6Ik7lLGtuom6/GiV79ckA
++uBMaR4CgYB1coa2pz6gnCkFZDIwg1Y++SBXmJ6nwGj96SiyIiczCzFLEmV8M0BI
+Q0XSz+jlWDbwI4uJC8rkv2bROvdNjR5oxuUpMdRZ0nnhk5X0YsnazDLjlfjupgj1
+Vo+A6JwXQUHP24z3RwDZyaotR/NUS5XcIt5jsfULt8eDi8WxlCXmLwIVAJhaQ0hI
+y5R6vtOGEtfB5jPDuYOK
 -----END DSA PRIVATE KEY-----
diff --git a/certs/s_dsa1024_pub.pem b/certs/s_dsa1024_pub.pem
index a80e368a094..c358566e66f 100644
--- a/certs/s_dsa1024_pub.pem
+++ b/certs/s_dsa1024_pub.pem
@@ -5,91 +5,91 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA/emailAddress=info@zeroc.com
         Validity
-            Not Before: Mar  8 00:14:59 2008 GMT
-            Not After : Mar  7 00:14:59 2013 GMT
-        Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server
+            Not Before: Jul  3 08:17:52 2012 GMT
+            Not After : Jul  2 08:17:52 2017 GMT
+        Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=127.0.0.1
         Subject Public Key Info:
             Public Key Algorithm: dsaEncryption
             DSA Public Key:
                 pub: 
-                    00:be:72:12:9f:12:5d:47:b3:9e:c0:77:8e:8c:72:
-                    5f:57:3a:35:a1:e4:cd:eb:98:11:31:fa:17:5b:a6:
-                    29:63:e4:2a:43:b2:dc:dc:e8:f8:84:9d:1c:9c:e5:
-                    85:2c:10:3f:34:7b:e4:03:72:55:52:14:36:f2:5c:
-                    45:a1:98:8c:86:48:1d:c8:82:5c:85:4c:a4:2c:5f:
-                    32:54:b9:e4:01:8a:a3:a1:67:14:95:9d:a1:44:32:
-                    28:ab:f2:76:55:4b:2e:16:76:b8:02:66:d0:0f:f0:
-                    9f:18:b2:14:9b:6c:bb:4a:c0:dd:eb:90:42:e8:94:
-                    94:f1:ef:7b:a8:4f:bc:b0:95
+                    75:72:86:b6:a7:3e:a0:9c:29:05:64:32:30:83:56:
+                    3e:f9:20:57:98:9e:a7:c0:68:fd:e9:28:b2:22:27:
+                    33:0b:31:4b:12:65:7c:33:40:48:43:45:d2:cf:e8:
+                    e5:58:36:f0:23:8b:89:0b:ca:e4:bf:66:d1:3a:f7:
+                    4d:8d:1e:68:c6:e5:29:31:d4:59:d2:79:e1:93:95:
+                    f4:62:c9:da:cc:32:e3:95:f8:ee:a6:08:f5:56:8f:
+                    80:e8:9c:17:41:41:cf:db:8c:f7:47:00:d9:c9:aa:
+                    2d:47:f3:54:4b:95:dc:22:de:63:b1:f5:0b:b7:c7:
+                    83:8b:c5:b1:94:25:e6:2f
                 P:   
-                    00:d8:c4:67:c0:78:b5:74:1e:28:c4:fb:d5:e6:6f:
-                    6c:19:8c:24:e9:fb:ac:82:fb:17:4a:3c:54:d9:4f:
-                    6a:bb:c2:ca:b0:6d:b3:2e:cd:0c:b9:02:f0:09:12:
-                    3a:be:19:66:b3:de:59:a5:d0:1c:13:d7:04:13:3d:
-                    a2:09:fc:f2:1f:67:eb:b2:7a:04:05:90:d9:5f:21:
-                    55:c5:7c:7b:96:ee:4d:e2:0d:51:cc:3d:b6:bc:38:
-                    c7:89:d9:fb:0a:14:cb:e4:62:54:a6:b0:ce:f2:a5:
-                    25:32:af:83:c7:f3:30:15:d3:56:d2:09:44:fc:49:
-                    fc:e3:38:43:1b:de:74:47:39
+                    00:f6:58:f5:b0:ca:9c:77:d1:bd:b1:b0:40:5f:f6:
+                    2d:1f:6c:fb:43:40:89:b7:18:ff:8e:5a:93:fe:48:
+                    c9:d3:08:61:cf:47:fc:cb:34:36:ba:32:5e:19:93:
+                    d6:5a:0e:48:59:ef:da:42:df:c3:b7:e9:19:9f:16:
+                    56:18:d6:e8:4b:d6:bb:cc:47:9a:ea:7a:15:53:c0:
+                    4d:d0:3a:be:6f:4e:0e:25:d3:c0:01:da:57:44:73:
+                    b7:fa:97:fd:dc:d8:b5:42:d8:ad:bf:00:16:e9:3c:
+                    5b:56:34:cf:62:65:5c:cf:bb:a0:31:51:93:cd:75:
+                    59:d8:0b:d9:84:2e:c9:61:9f
                 Q:   
-                    00:87:fc:d1:43:d2:9f:a0:00:1e:55:8e:8b:fc:dc:
-                    51:cd:21:65:8a:1d
+                    00:c6:25:e7:49:54:f3:5c:55:7f:71:65:27:62:bc:
+                    8f:9c:61:f5:ce:17
                 G:   
-                    04:f1:d1:35:4e:7c:df:e3:74:1e:58:d0:09:e9:da:
-                    1a:8b:63:a6:a1:0b:97:d9:e4:26:cd:13:6f:5b:18:
-                    ec:12:f6:b1:74:70:e1:04:3a:80:b4:b2:02:68:b4:
-                    8d:7b:7f:7e:15:ec:e3:91:66:5b:ab:97:a5:55:b1:
-                    db:92:fd:ec:28:57:bd:90:1b:0b:e1:4a:bf:fd:74:
-                    f6:a4:4d:ab:52:6d:f9:36:17:da:92:ee:2a:91:b0:
-                    6e:9c:09:3b:2f:24:83:b8:ba:38:2d:49:94:80:49:
-                    57:eb:e2:17:0b:ed:bb:67:c6:f7:ea:d5:f1:d9:fb:
-                    1e:49:87:63:d0:63:e1:b0
+                    60:57:b6:bf:4c:c8:fb:36:bf:7e:fd:e9:57:34:7c:
+                    55:41:38:00:ed:ff:83:b2:98:e1:ea:0b:80:d3:e5:
+                    13:c5:90:f7:5d:58:3c:a8:dd:33:f4:c7:b3:53:79:
+                    3e:ac:8f:d8:88:7f:af:49:0c:31:bc:f0:fa:3c:69:
+                    49:e8:3d:a9:7a:d3:c6:85:84:3c:97:5b:a3:df:7c:
+                    5f:84:a3:d1:2b:e1:95:91:fe:17:15:c1:40:dd:21:
+                    2c:54:f5:68:a5:2c:7e:f6:4e:36:08:04:19:f4:3b:
+                    6f:7a:3a:22:4e:e5:2c:6b:6e:a2:6e:bf:1a:25:7b:
+                    f5:c9:00:fa:e0:4c:69:1e
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                96:6E:55:0D:A3:8F:0F:83:05:7D:81:FC:C2:D5:61:ED:B9:93:C5:43
+                58:DF:E8:C0:DD:E3:DF:41:45:12:ED:10:F0:16:19:95:A4:F1:FD:BA
             X509v3 Authority Key Identifier: 
-                keyid:98:47:F1:08:3C:55:3F:B6:A7:BC:62:C6:02:12:85:8F:BD:96:19:BA
+                keyid:8A:AE:B4:AA:C5:54:D5:CE:D0:6A:0C:FF:3D:83:8C:60:B4:AD:70:DB
                 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA/emailAddress=info@zeroc.com
-                serial:ED:07:45:CD:BD:7D:29:F0
+                serial:DB:C1:07:84:72:86:C9:56
 
             X509v3 Subject Alternative Name: 
-                DNS:server, IP Address:127.0.0.1
+                DNS:127.0.0.1, IP Address:127.0.0.1
     Signature Algorithm: md5WithRSAEncryption
-        a1:4c:0f:e2:94:b3:ac:48:df:33:61:e0:bd:d6:ef:80:09:88:
-        28:2b:01:d1:1c:34:34:79:f9:90:9c:84:ca:cd:c0:2e:03:5f:
-        e7:4c:f9:e0:16:92:c0:98:f8:bc:b7:04:34:cf:a4:4d:92:80:
-        69:34:23:f7:1a:cc:83:ff:bf:e7:2b:59:f0:b2:07:66:c7:42:
-        b9:b6:78:e3:5a:64:b3:32:10:5b:51:99:60:83:21:af:ba:b2:
-        0b:93:8c:91:0c:5f:1d:74:9e:0f:b3:06:f3:62:7a:d7:8e:ba:
-        b3:27:b0:32:0f:66:f2:d5:2f:15:ab:e3:e0:e3:f3:db:29:cd:
-        53:0b
+        3b:c5:1b:9d:c7:17:7a:21:ca:34:3f:d8:3c:ad:43:48:21:1b:
+        a3:0c:86:23:dc:d9:17:b4:11:63:af:bd:3c:09:8f:62:ed:f2:
+        82:80:0f:d4:47:6e:5f:e6:ee:d6:ed:6f:d9:c4:f4:f9:83:a2:
+        36:4f:1f:b8:f1:ef:d5:0e:10:b7:da:fc:4c:2c:76:ad:68:0c:
+        bd:f5:90:93:45:61:f8:66:36:dd:d5:42:37:93:bb:8a:28:d0:
+        bd:40:88:b5:00:f7:0f:96:40:ec:40:44:ac:3f:e8:17:ce:8a:
+        17:e7:48:0d:94:72:ab:84:2e:25:ae:7c:f9:27:a4:b2:02:b5:
+        c7:08
 -----BEGIN CERTIFICATE-----
-MIIEsjCCBBugAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
+MIIEtzCCBCCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
 EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU
 MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVy
-b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMDgw
-MzA4MDAxNDU5WhcNMTMwMzA3MDAxNDU5WjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
+b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTIw
+NzAzMDgxNzUyWhcNMTcwNzAyMDgxNzUyWjB2MQswCQYDVQQGEwJVUzEQMA4GA1UE
 CBMHRmxvcmlkYTEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xDzANBgNVBAMTBlNlcnZlcjCC
-AbcwggErBgcqhkjOOAQBMIIBHgKBgQDYxGfAeLV0HijE+9Xmb2wZjCTp+6yC+xdK
-PFTZT2q7wsqwbbMuzQy5AvAJEjq+GWaz3lml0BwT1wQTPaIJ/PIfZ+uyegQFkNlf
-IVXFfHuW7k3iDVHMPba8OMeJ2fsKFMvkYlSmsM7ypSUyr4PH8zAV01bSCUT8Sfzj
-OEMb3nRHOQIVAIf80UPSn6AAHlWOi/zcUc0hZYodAoGABPHRNU583+N0HljQCena
-GotjpqELl9nkJs0Tb1sY7BL2sXRw4QQ6gLSyAmi0jXt/fhXs45FmW6uXpVWx25L9
-7ChXvZAbC+FKv/109qRNq1Jt+TYX2pLuKpGwbpwJOy8kg7i6OC1JlIBJV+viFwvt
-u2fG9+rV8dn7HkmHY9Bj4bADgYUAAoGBAL5yEp8SXUeznsB3joxyX1c6NaHkzeuY
-ETH6F1umKWPkKkOy3Nzo+ISdHJzlhSwQPzR75ANyVVIUNvJcRaGYjIZIHciCXIVM
-pCxfMlS55AGKo6FnFJWdoUQyKKvydlVLLhZ2uAJm0A/wnxiyFJtsu0rA3euQQuiU
-lPHve6hPvLCVo4IBFjCCARIwCQYDVR0TBAIwADAdBgNVHQ4EFgQUlm5VDaOPD4MF
-fYH8wtVh7bmTxUMwgcwGA1UdIwSBxDCBwYAUmEfxCDxVP7anvGLGAhKFj72WGbqh
-gZ2kgZowgZcxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRhMRswGQYDVQQH
-ExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJbmMuMQwwCgYD
-VQQLEwNJY2UxFjAUBgNVBAMTDVplcm9DIFRlc3QgQ0ExHTAbBgkqhkiG9w0BCQEW
-DmluZm9AemVyb2MuY29tggkA7QdFzb19KfAwFwYDVR0RBBAwDoIGc2VydmVyhwR/
-AAABMA0GCSqGSIb3DQEBBAUAA4GBAKFMD+KUs6xI3zNh4L3W74AJiCgrAdEcNDR5
-+ZCchMrNwC4DX+dM+eAWksCY+Ly3BDTPpE2SgGk0I/cazIP/v+crWfCyB2bHQrm2
-eONaZLMyEFtRmWCDIa+6sguTjJEMXx10ng+zBvNieteOurMnsDIPZvLVLxWr4+Dj
-89spzVML
+MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xEjAQBgNVBAMTCTEyNy4wLjAu
+MTCCAbYwggErBgcqhkjOOAQBMIIBHgKBgQD2WPWwypx30b2xsEBf9i0fbPtDQIm3
+GP+OWpP+SMnTCGHPR/zLNDa6Ml4Zk9ZaDkhZ79pC38O36RmfFlYY1uhL1rvMR5rq
+ehVTwE3QOr5vTg4l08AB2ldEc7f6l/3c2LVC2K2/ABbpPFtWNM9iZVzPu6AxUZPN
+dVnYC9mELslhnwIVAMYl50lU81xVf3FlJ2K8j5xh9c4XAoGAYFe2v0zI+za/fv3p
+VzR8VUE4AO3/g7KY4eoLgNPlE8WQ911YPKjdM/THs1N5PqyP2Ih/r0kMMbzw+jxp
+Seg9qXrTxoWEPJdbo998X4Sj0SvhlZH+FxXBQN0hLFT1aKUsfvZONggEGfQ7b3o6
+Ik7lLGtuom6/GiV79ckA+uBMaR4DgYQAAoGAdXKGtqc+oJwpBWQyMINWPvkgV5ie
+p8Bo/ekosiInMwsxSxJlfDNASENF0s/o5Vg28COLiQvK5L9m0Tr3TY0eaMblKTHU
+WdJ54ZOV9GLJ2swy45X47qYI9VaPgOicF0FBz9uM90cA2cmqLUfzVEuV3CLeY7H1
+C7fHg4vFsZQl5i+jggEZMIIBFTAJBgNVHRMEAjAAMB0GA1UdDgQWBBRY3+jA3ePf
+QUUS7RDwFhmVpPH9ujCBzAYDVR0jBIHEMIHBgBSKrrSqxVTVztBqDP89g4xgtK1w
+26GBnaSBmjCBlzELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNV
+BAcTElBhbG0gQmVhY2ggR2FyZGVuczEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAK
+BgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVyb0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJ
+ARYOaW5mb0B6ZXJvYy5jb22CCQDbwQeEcobJVjAaBgNVHREEEzARggkxMjcuMC4w
+LjGHBH8AAAEwDQYJKoZIhvcNAQEEBQADgYEAO8UbnccXeiHKND/YPK1DSCEbowyG
+I9zZF7QRY6+9PAmPYu3ygoAP1EduX+bu1u1v2cT0+YOiNk8fuPHv1Q4Qt9r8TCx2
+rWgMvfWQk0Vh+GY23dVCN5O7iijQvUCItQD3D5ZA7EBErD/oF86KF+dIDZRyq4Qu
+Ja58+SeksgK1xwg=
 -----END CERTIFICATE-----
diff --git a/certs/s_rsa1024.pfx b/certs/s_rsa1024.pfx
index 3b8119fe741..b67ca9198d3 100644
--- a/certs/s_rsa1024.pfx
+++ b/certs/s_rsa1024.pfx
diff --git a/certs/s_rsa1024_priv.pem b/certs/s_rsa1024_priv.pem
index ec2ec2eaa83..61ca30e3bd7 100644
--- a/certs/s_rsa1024_priv.pem
+++ b/certs/s_rsa1024_priv.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDBqWKK5tTlYwgSlp+kQ6nebZdiIQBDw8QdH/TSn2ig5D5JRS34
-4m6EmlN2LduTVgq/JeJ+82T3uFnKpRuC2Rc2ey8RAjgwxz4Zxob6ycbVDHzfvPgL
-xhQ/pPIAfjUGTjhTjCRH3/eh822L8AUR3zu48JVVwyamjlNW2mGhu0U8DwIDAQAB
-AoGALVjufDwFChmgYEno49v8QNtEoXO8ziFfILrE5zTwmQwZEasjUq4i1uYUOQ4P
-5nY1WgETAksYD3GZhPwYbxFKf8xV408MFAmS0IQu5Lv1j+dmRiQWyI8iiZi5RsRc
-f88LEJ8YXrpUgOcCo7FyurY8tGvX+FOlkW/sybKnAo+wSlECQQD7nkoTRvtZMzDR
-l9iso97SqOA2JNGeeCb7jBHsOtqulM1YkBdM2nszeFWGsz9JXsq5Te2WUwc1+upw
-+pMzfAeVAkEAxQi5xb+LnTz0QBzK/KKlq3ZJfO8bwv/xGsl25oh/TreU2HIpY8iW
-Sv4CQy2FKldl2WMHfk17a7naFnLQXLL8EwJBAK9WpZ37V8nX/0v++ZGMfAjmf5+b
-VquMZPXjrNWmSZ9guBvgBSycD0BVuZutKwvQz4oDwO2BHEREfryOEKfO5WUCQQCE
-HmK7V8JdcCbz6pquJr3iKFIEpSy/Z/GbHaZN1Q9QkEcNkBdy4mjs5kBMHXTivHH9
-/6phpcDxrlCvptNSpW3jAkEA7qK8SKUk0t4MKAi3L7dzJlNTEixBLKg1kvzpe3My
-d0wq5ruuBey+S2UHmaqv8may8+Qv4uKuyrXWbuQUYOzuhg==
+MIICXAIBAAKBgQCr5Fi0JsrF53+Eya3He+CjqFdMi2eugpFlYGRKIDcKaBi0ntAo
+gHN+XhSkFsansRSE+iO9fUnYetKkuESQDGFDEcjFIYFnpLPfJ7ucP4tz7w4fsehv
+ty66T0FeoGGy3HOiUGQp/McR0llfV6ZXz/iuk52/N+E9xcmBzlonaN2L+QIDAQAB
+AoGAMyPKqD5qUZrgO3dtNk5KtSYeYu2OuUKrU0fsTolrFrOFticRsxsUQWJoLbGB
+BN8QRcfN3lBqKffQt6UC8QBd5wNlu6o3v2ZGD58qHuEdr5K+s7JtlpKYEgzjjvzs
+BS+NE+jiJrErbS8jSpGNa4JVHH4wxrC92ikzB/u70VniQ6ECQQDcv/0H2NaqaGkG
+Uen5kRz/+Ym61vaGqpnCigxyOWn8moConQSpL+A0OadLAqFPt7WTUc0rSuOLd1Wc
+s3PYmvH1AkEAx1cZPdMwm0UpH2uqTPSUbVSgPmxys3zzMAbPFqsh4qDQEaCn0SJB
+5BJo0IhWQ76jTPTikAiD4yAHSjS/ubO7dQJAWUOVSQgI/g2Mco7LIyzn4iaA6Dmm
+pJv14zG5iLLoxcmgPw6HZPbEHbo2iOF+Y2LxHKpWYaw9yRavWtdCABPfxQJBAL4U
+E4Gci9DDFf9cDrvqzE2kUFi12HnGP64gEAAxltIfPchRRTRqUiJEW6XdG0Tl15le
+OVvWgsxkkg70VY2iELECQGnt3kzKVRGQJYL4No6t7riTaRHThUXnnuIF4NzlBE9h
+owHfmDY5m4LcstCbTF4bdDjowb0D4UJgb8lwWCksTJA=
 -----END RSA PRIVATE KEY-----
diff --git a/certs/s_rsa1024_pub.pem b/certs/s_rsa1024_pub.pem
index 275b62552e9..75f47734c76 100644
--- a/certs/s_rsa1024_pub.pem
+++ b/certs/s_rsa1024_pub.pem
@@ -5,63 +5,63 @@ Certificate:
         Signature Algorithm: md5WithRSAEncryption
         Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA/emailAddress=info@zeroc.com
         Validity
-            Not Before: Mar  8 00:14:58 2008 GMT
-            Not After : Mar  7 00:14:58 2013 GMT
-        Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server
+            Not Before: Jul  3 08:17:51 2012 GMT
+            Not After : Jul  2 08:17:51 2017 GMT
+        Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=127.0.0.1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
             RSA Public Key: (1024 bit)
                 Modulus (1024 bit):
-                    00:c1:a9:62:8a:e6:d4:e5:63:08:12:96:9f:a4:43:
-                    a9:de:6d:97:62:21:00:43:c3:c4:1d:1f:f4:d2:9f:
-                    68:a0:e4:3e:49:45:2d:f8:e2:6e:84:9a:53:76:2d:
-                    db:93:56:0a:bf:25:e2:7e:f3:64:f7:b8:59:ca:a5:
-                    1b:82:d9:17:36:7b:2f:11:02:38:30:c7:3e:19:c6:
-                    86:fa:c9:c6:d5:0c:7c:df:bc:f8:0b:c6:14:3f:a4:
-                    f2:00:7e:35:06:4e:38:53:8c:24:47:df:f7:a1:f3:
-                    6d:8b:f0:05:11:df:3b:b8:f0:95:55:c3:26:a6:8e:
-                    53:56:da:61:a1:bb:45:3c:0f
+                    00:ab:e4:58:b4:26:ca:c5:e7:7f:84:c9:ad:c7:7b:
+                    e0:a3:a8:57:4c:8b:67:ae:82:91:65:60:64:4a:20:
+                    37:0a:68:18:b4:9e:d0:28:80:73:7e:5e:14:a4:16:
+                    c6:a7:b1:14:84:fa:23:bd:7d:49:d8:7a:d2:a4:b8:
+                    44:90:0c:61:43:11:c8:c5:21:81:67:a4:b3:df:27:
+                    bb:9c:3f:8b:73:ef:0e:1f:b1:e8:6f:b7:2e:ba:4f:
+                    41:5e:a0:61:b2:dc:73:a2:50:64:29:fc:c7:11:d2:
+                    59:5f:57:a6:57:cf:f8:ae:93:9d:bf:37:e1:3d:c5:
+                    c9:81:ce:5a:27:68:dd:8b:f9
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                75:FA:B7:3C:6B:1C:F8:FA:69:4B:75:A0:22:51:B2:AC:11:54:A7:E7
+                CD:66:00:D0:4D:B8:E9:57:27:5B:0D:4A:05:1E:71:D0:7F:E3:6F:05
             X509v3 Authority Key Identifier: 
-                keyid:98:47:F1:08:3C:55:3F:B6:A7:BC:62:C6:02:12:85:8F:BD:96:19:BA
+                keyid:8A:AE:B4:AA:C5:54:D5:CE:D0:6A:0C:FF:3D:83:8C:60:B4:AD:70:DB
                 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA/emailAddress=info@zeroc.com
-                serial:ED:07:45:CD:BD:7D:29:F0
+                serial:DB:C1:07:84:72:86:C9:56
 
             X509v3 Subject Alternative Name: 
-                DNS:server, IP Address:127.0.0.1
+                DNS:127.0.0.1, IP Address:127.0.0.1
     Signature Algorithm: md5WithRSAEncryption
-        8e:3b:c1:d1:9c:b1:2d:71:ea:7f:4d:04:1b:1d:95:4b:e3:27:
-        e1:6d:11:2c:f8:85:32:25:b6:d9:9a:62:dd:5b:b9:0d:0d:30:
-        46:ce:57:26:e4:70:b0:fc:89:1e:3f:9d:2f:68:56:80:3f:d0:
-        0f:a1:16:49:ea:ac:a6:5c:5a:eb:43:78:99:91:2b:3b:88:82:
-        5f:47:77:a8:4f:e2:fc:89:f5:0c:2c:93:25:25:39:d4:19:6c:
-        9f:4e:fa:0c:af:9a:a7:51:8a:bd:7b:61:8a:37:45:eb:47:9d:
-        1d:2a:78:58:d1:20:f2:ce:a9:66:57:96:be:af:58:bd:3f:1d:
-        66:b1
+        8d:aa:42:44:c8:73:f5:45:e5:0a:e8:b4:97:59:43:5a:8b:2f:
+        94:ea:b4:9e:6e:cd:c2:3c:5e:63:ec:5d:b1:1f:62:24:f8:66:
+        77:e5:c1:34:05:dd:f2:8d:25:bc:b9:d8:ec:9c:00:4c:bc:49:
+        e0:4e:f6:3f:d1:e9:60:56:27:32:e2:49:c5:b4:6b:98:62:67:
+        b5:78:cc:33:0a:15:79:6b:a0:20:ec:70:f7:f2:b3:59:9c:47:
+        23:12:5f:11:e7:12:a7:4e:a5:27:71:82:30:fb:65:1a:e8:30:
+        ef:5a:ce:f1:0a:99:81:4e:ae:82:2e:84:0b:3d:d7:c2:18:55:
+        32:35
 -----BEGIN CERTIFICATE-----
-MIIDmTCCAwKgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
+MIIDnzCCAwigAwIBAgIBATANBgkqhkiG9w0BAQQFADCBlzELMAkGA1UEBhMCVVMx
 EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU
 MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEWMBQGA1UEAxMNWmVy
-b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMDgw
-MzA4MDAxNDU4WhcNMTMwMzA3MDAxNDU4WjBzMQswCQYDVQQGEwJVUzEQMA4GA1UE
+b0MgVGVzdCBDQTEdMBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20wHhcNMTIw
+NzAzMDgxNzUxWhcNMTcwNzAyMDgxNzUxWjB2MQswCQYDVQQGEwJVUzEQMA4GA1UE
 CBMHRmxvcmlkYTEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEd
-MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xDzANBgNVBAMTBlNlcnZlcjCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwaliiubU5WMIEpafpEOp3m2XYiEA
-Q8PEHR/00p9ooOQ+SUUt+OJuhJpTdi3bk1YKvyXifvNk97hZyqUbgtkXNnsvEQI4
-MMc+GcaG+snG1Qx837z4C8YUP6TyAH41Bk44U4wkR9/3ofNti/AFEd87uPCVVcMm
-po5TVtphobtFPA8CAwEAAaOCARYwggESMAkGA1UdEwQCMAAwHQYDVR0OBBYEFHX6
-tzxrHPj6aUt1oCJRsqwRVKfnMIHMBgNVHSMEgcQwgcGAFJhH8Qg8VT+2p7xixgIS
-hY+9lhm6oYGdpIGaMIGXMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEb
-MBkGA1UEBxMSUGFsbSBCZWFjaCBHYXJkZW5zMRQwEgYDVQQKEwtaZXJvQywgSW5j
-LjEMMAoGA1UECxMDSWNlMRYwFAYDVQQDEw1aZXJvQyBUZXN0IENBMR0wGwYJKoZI
-hvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJAO0HRc29fSnwMBcGA1UdEQQQMA6CBnNl
-cnZlcocEfwAAATANBgkqhkiG9w0BAQQFAAOBgQCOO8HRnLEtcep/TQQbHZVL4yfh
-bREs+IUyJbbZmmLdW7kNDTBGzlcm5HCw/IkeP50vaFaAP9APoRZJ6qymXFrrQ3iZ
-kSs7iIJfR3eoT+L8ifUMLJMlJTnUGWyfTvoMr5qnUYq9e2GKN0XrR50dKnhY0SDy
-zqlmV5a+r1i9Px1msQ==
+MBsGCSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb20xEjAQBgNVBAMTCTEyNy4wLjAu
+MTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAq+RYtCbKxed/hMmtx3vgo6hX
+TItnroKRZWBkSiA3CmgYtJ7QKIBzfl4UpBbGp7EUhPojvX1J2HrSpLhEkAxhQxHI
+xSGBZ6Sz3ye7nD+Lc+8OH7Hob7cuuk9BXqBhstxzolBkKfzHEdJZX1emV8/4rpOd
+vzfhPcXJgc5aJ2jdi/kCAwEAAaOCARkwggEVMAkGA1UdEwQCMAAwHQYDVR0OBBYE
+FM1mANBNuOlXJ1sNSgUecdB/428FMIHMBgNVHSMEgcQwgcGAFIqutKrFVNXO0GoM
+/z2DjGC0rXDboYGdpIGaMIGXMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlk
+YTEbMBkGA1UEBxMSUGFsbSBCZWFjaCBHYXJkZW5zMRQwEgYDVQQKEwtaZXJvQywg
+SW5jLjEMMAoGA1UECxMDSWNlMRYwFAYDVQQDEw1aZXJvQyBUZXN0IENBMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbYIJANvBB4RyhslWMBoGA1UdEQQTMBGC
+CTEyNy4wLjAuMYcEfwAAATANBgkqhkiG9w0BAQQFAAOBgQCNqkJEyHP1ReUK6LSX
+WUNaiy+U6rSebs3CPF5j7F2xH2Ik+GZ35cE0Bd3yjSW8udjsnABMvEngTvY/0elg
+Vicy4knFtGuYYme1eMwzChV5a6Ag7HD38rNZnEcjEl8R5xKnTqUncYIw+2Ua6DDv
+Ws7xCpmBTq6CLoQLPdfCGFUyNQ==
 -----END CERTIFICATE-----
diff --git a/certs/server.jks b/certs/server.jks
index da09612e455..8bd2459adbe 100644
--- a/certs/server.jks
+++ b/certs/server.jks
diff --git a/config/Make.common.rules.mak b/config/Make.common.rules.mak
index aac61285d37..4238fc5cea0 100644
--- a/config/Make.common.rules.mak
+++ b/config/Make.common.rules.mak
@@ -33,6 +33,9 @@ ice_bin_dist = 1
 
 !if "$(AS)" == "ml64" || "$(XTARGET)" == "x64"
 x64suffix		= \x64
+ARCH			= x64
+!else
+ARCH			= x86
 !endif
 
 ice_bin_dist_dir = $(PROGRAMFILES)\ZeroC\Ice-$(VERSION)
@@ -147,16 +150,15 @@ install-common::
 	    @echo "Creating $(prefix)..." && \
 	    mkdir "$(prefix)"
 
-!if "$(install_slicedir)" != ""
+!if "$(WINRT)" != "yes" && "$(install_slicedir)" != ""
 	@if not exist "$(install_slicedir)" \
 	    @echo "Creating $(install_slicedir)..." && \
 	    mkdir "$(install_slicedir)" && \
 	    @echo "Copying slice files..." && \
 	    cmd /c "xcopy /s /y $(top_srcdir)\..\slice "$(install_slicedir)"" || exit 1
-!endif
 
 	@if not exist "$(prefix)\ICE_LICENSE" \
 	    @copy $(top_srcdir)\..\ICE_LICENSE "$(prefix)"
 	@if not exist "$(prefix)\LICENSE" \
 	    @copy $(top_srcdir)\..\LICENSE "$(prefix)"
-
+!endif
diff --git a/config/makedepend-winrt.py b/config/makedepend-winrt.py
new file mode 100644
index 00000000000..8b1ad41a464
--- /dev/null
+++ b/config/makedepend-winrt.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+import sys, os, fileinput, re, string, getopt
+
+previous = ""
+
+commentre = re.compile("^#")
+
+for top_srcdir in [".", "..", "../..", "../../..", "../../../.."]:
+    top_srcdir = os.path.normpath(top_srcdir)
+    if os.path.exists(os.path.join(top_srcdir, "..", "config", "makedepend.py")):
+        break
+else:
+    raise "can't find top level source directory!"
+    
+def contains(s, words):
+    i = -1
+    l = 0
+    for word in words:
+        i = s.find(word) 
+        if i >= 0:
+            l = len(word)
+            break
+    return i, l
+
+dependmak = open(".depend.mak", "a")
+
+HDIR = "$(HDIR)"
+CPPDIR =  ".."
+
+if len(sys.argv) >= 2:
+    HDIR = sys.argv[1]
+
+if len(sys.argv) >= 3:
+    CPPDIR = sys.argv[2]
+
+includes = []
+for line in fileinput.input("-"):
+    line = line.strip()
+    if not line:
+        continue
+    if(previous):
+        line = previous + " " + line
+
+    if(line[-1] == "\\"):
+        previous = line[:-2]
+        continue
+    else:
+        previous = ""
+    line = line.replace("/", "\\")
+    if line.startswith("Note: including file:"):
+        line = line[len("Note: including file:"):].strip()
+        (i, l) = contains (line, ["IceUtil\\", "Ice\\", "Glacier2\\", "Glacier2Lib\\", "IceStorm\\", "IceGrid\\", "IceGridLib\\", "IceStormLib\\"])
+        if i >= 0:
+            j = line.find("winrt\\")
+            if j < 0:
+                j = line.find("cpp\\src\\")
+                if j >= 0 and i > j:
+                    j = i + l
+                    line = line[j:]
+                    if not line in includes:
+                        print >>dependmak, '"..\\' + line + '"',
+                        includes.append(line)
+                    continue
+            if j < 0:
+                j = line.find("cpp\\include\\")
+            if j >= 0:
+                line = line[j:]
+            line = line.replace("winrt\\", "")
+            line = line.replace("cpp\\src\\", "..\\")
+            line = line.replace("..\\..\\..\\include\\", "$(includedir)\\")
+            line = line.strip()
+            if not line in includes:
+                print >>dependmak, '"' + line + '"',
+                includes.append(line)
+    elif line.endswith(".cpp") and not line.endswith(".cpp:"):
+        line = "$(ARCH)\\$(CONFIG)\\" + line.replace(".cpp", "$(OBJEXT):") + " " + sys.argv[1]
+        print >>dependmak, line,
+    elif line.find("slice\\") >= 0:
+        for s in line.split():
+            i = s.find("slice\\")
+            if i >= 0:
+                s = "$(slicedir)\\" + s[i + len("slice\\"):]
+                print >>dependmak, '"' + s + '"',
+            elif s.endswith(".cpp:"):
+                print >>dependmak, CPPDIR + "\\" + s,
+            elif s.endswith(".h"):
+                print >>dependmak, HDIR + "\\" + s,
+        print >>dependmak, "\"$(SLICE2CPP)\""
+
+print >>dependmak
+dependmak.close()
diff --git a/cpp/INSTALL.WINRT b/cpp/INSTALL.WINRT
new file mode 100644
index 00000000000..6b6ed2ea310
--- /dev/null
+++ b/cpp/INSTALL.WINRT
@@ -0,0 +1,135 @@
+======================================================================
+Introduction
+======================================================================
+
+This file describes the Ice source distribution for WinRT, including 
+information about compiler requirements, and instructions for building 
+and testing the distribution.
+
+For information about Ice for Windows see INSTALL.WINDOWS in this 
+directory
+
+If you prefer, you can download a Windows installer that contains
+pre-compiled debug and release libraries, executables, and everything
+else necessary to build Ice applications on Windows at the link below:
+
+  http://www.zeroc.com/download.html
+
+
+======================================================================
+Requirements
+======================================================================
+
+
+Windows version
+---------------
+
+Ice for WinRT has been extensively tested on:
+
+ - Windows 8 (x86 & x64)
+
+C++ compiler
+------------
+
+The following C++ compilers are supported:
+
+- Microsoft Visual C++ 2012 (Professional and Express editions)
+
+
+======================================================================
+Compilation and Testing
+======================================================================
+
+
+Building Ice for WinRT
+----------------------
+
+Using your favorite Zip tool, unzip the Ice source archive anywhere 
+you like.
+
+To build Ice for WinRT you first need to build Ice for Windows, refer
+to INSTALL.WINDOWS file for instructions on how to build Ice for Windows.
+
+Open a command prompt that is configured for your target architecture.
+For example, when using Visual Studio 2012, you
+have several alternatives:
+
+ - Visual Studio Command Prompt
+ - Visual Studio x64 Win64 Command Prompt
+ - Visual Studio x64 Cross Tools Command Prompt
+
+Using the first configuration produces 32-bit binaries, while the
+second produces 64-bit binaries. In order to build a 64-bit version of
+Ice using a "Cross Tools" command prompt, you must set the following
+environment variable:
+
+> set XTARGET=x64
+
+Note that you must be using a Windows 8 x64 platform when compiling a
+64-bit version of Ice.
+
+Change the working directory to Ice-@ver@. For example:
+
+> cd C:\Ice-@ver@\cpp
+
+Edit config\Make.rules.mak to establish your build configuration. The
+comments in the file provide more information. In particular, you
+must set CPP_COMPILER to the appropriate compiler, for WinRT the supported
+values are VC110 and VC110_EXPRESS.
+
+You should also set WINRT=yes
+
+Now you're ready to build Ice for WinRT:
+
+> nmake /f Makefile.mak
+
+
+After build has completed you must register IceWinRT SDK in Windows registry
+
+> nmake /f Makefile.mak register-sdk
+
+* This command must be executed for a command promt that has administrative
+  privileges; as it require write access to windows registry.
+
+
+Running the Test Suite
+----------------------
+
+The WinRT test suite is composed of a set of dynamic libraries (one for each
+client/server test) and a Visual Studio project GUI application that load
+and run the tests in the dynamic libraries.
+
+You need to first build the dynamic libraries,
+
+Change the working directory to Ice-@ver@. For example:
+
+> cd C:\Ice-@ver@\cpp\test
+
+Edit config\Make.rules.mak to stablish configuration.
+
+> nmake /f Makefile.mak
+
+From Visual Studio 2012 open the project "cpp/test/WinRT/TestSuite.sln"
+you must select the configuration according to the configuration used to
+build the dynamic libraries.
+
+If you have build the test libraries for x86 and debug, you must select 
+Win32 Debug.
+
+After set the appropriate configuration build the solution, using 
+"Build Solution" command in "Build" menu. 
+
+After build completes you can deploy the application using 
+"Deploy Solution" command in "Build" menu, once deploy complete you can
+start the application from WinRT Desktop; just click "Ice Test Suite" icon.
+
+
+======================================================================
+Installation
+======================================================================
+
+Simply run "nmake /f Makefile.mak install". This will install IceWinRT SDK
+in the directory specified by the "prefix" variable in
+config\Make.rules.mak.
+
+
diff --git a/cpp/Makefile.mak b/cpp/Makefile.mak
index 23dfe01c93c..1e2110e822e 100644
--- a/cpp/Makefile.mak
+++ b/cpp/Makefile.mak
@@ -11,6 +11,7 @@ top_srcdir	= .
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
 SUBDIRS		= config src include test demo
 
 INSTALL_SUBDIRS	= "$(install_bindir)" "$(install_libdir)" "$(install_includedir)" "$(install_configdir)"
@@ -20,11 +21,40 @@ install:: install-common
 	    @if not exist %i \
 		@echo "Creating %i..." && \
 		mkdir %i
+		
+test::
+	@python $(top_srcdir)/allTests.py
+	
+!else
+SUBDIRS		= src include test
+
+SDK_FULL_PATH	= $(MAKEDIR)\$(SDK_BASE_PATH)
+SDK_FULL_PATH	= $(SDK_FULL_PATH:\.\=\)
+SDK_KEY 	= HKLM\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKs\$(SDK_NAME)\$(SDK_VERSION)
+INSTALL_SUBDIRS	= $(prefix)\SDKs
+
+register-sdk:
+	@echo Register SDK "$(SDK_NAME)" in Windows registry "$(SDK_KEY)"
+	@reg ADD "$(SDK_KEY)" /ve /d "$(SDK_FULL_PATH)" /f || \
+	@echo "Could not add registry keyword $(SDK_KEY)"
+
+unregister-sdk:
+	@echo Unregister SDK "$(SDK_NAME)" delete Windows registry key "$(SDK_KEY)"
+	@reg DELETE "$(SDK_KEY)" /f || \
+	@echo "Registry Keyword $(SDK_KEY) not exists"
+	
+install:: install-common
+	@for %i in ( $(INSTALL_SUBDIRS) ) do \
+	    @if not exist %i \
+		@echo "Creating %i..." && \
+		mkdir %i
+	xcopy /s /y "$(top_srcdir)\SDKs" "$(prefix)\SDKs"
+	@echo Register SDK "$(SDK_NAME)" in Windows registry "$(SDK_KEY)"
+	@reg ADD "$(SDK_KEY)" /ve /d "$(prefix)\SDKs\$(SDK_NAME)\$(SDK_VERSION)" /f || \
+	echo "Could not add registry keyword $(SDK_KEY)" && exit 1
+!endif
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @echo "making $@ in %i" && \
 	    cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $@" || exit 1
-
-test::
-	@python $(top_srcdir)/allTests.py
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index e4d58544ebf..7173648c14f 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -28,19 +28,28 @@ prefix			= C:\Ice-$(VERSION)
 
 #
 # Specify your C++ compiler. Supported values are:
-# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, BCC2010
+# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, BCC2010, VC110, VC110_EXPRESS
 #
 !if "$(CPP_COMPILER)" == ""
 CPP_COMPILER		= VC90
 !endif
 
 #
+# Define if you want to build for WinRT
+#
+#WINRT		= yes
+
+#
 # If third party libraries are not installed in the default location
 # or THIRDPARTY_HOME is not set in your environment variables then
 # change the following setting to reflect the installation location.
 #
 !if "$(THIRDPARTY_HOME)" == ""
-THIRDPARTY_HOME	 = $(PROGRAMFILES)\ZeroC\Ice-$(VERSION)-ThirdParty
+!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64" && "$(PROCESSOR_ARCHITECTUREW6432)" == ""
+THIRDPARTY_HOME = $(PROGRAMFILES) (x86)\ZeroC\Ice-$(VERSION)-ThirdParty
+!else
+THIRDPARTY_HOME = $(PROGRAMFILES)\ZeroC\Ice-$(VERSION)-ThirdParty 
+!endif
 !endif
 
 #
@@ -93,12 +102,17 @@ BCPLUSPLUS		= yes
 !include 	$(top_srcdir)/config/Make.rules.bcc
 !elseif "$(CPP_COMPILER)" == "VC60" || \
         "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
-        "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
+        "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS" || \
+	"$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
 !include        $(top_srcdir)/config/Make.rules.msvc
 ! else
 !error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
 !endif
 
+!if "$(WINRT)" == "yes" && "$(CPP_COMPILER)" != "VC110" && "$(CPP_COMPILER)" != "VC110_EXPRESS"
+!error CPP_COMPILER: $(CPP_COMPILER) not supported to build Ice for WinRT
+!endif
+
 !if "$(CPP_COMPILER)" == "BCC2010"
 libsuff			= \bcc10
 !elseif "$(CPP_COMPILER)" == "VC60"
@@ -106,6 +120,8 @@ libsuff			= \vc6
 UNIQUE_DLL_NAMES	= yes
 !elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
 libsuff			= \vc100$(x64suffix)
+!elseif "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
+libsuff			= \vc110$(x64suffix)
 !else
 libsuff			= $(x64suffix)
 !endif
@@ -130,7 +146,9 @@ COMPSUFFIX	= vc60_
 !elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
 COMPSUFFIX	= vc90_
 !elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
-COMPSUFFIX	= vc100_
+COMPSUFFIX  = vc100_
+!elseif "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
+COMPSUFFIX  = vc110_
 !elseif "$(CPP_COMPILER)" == "BCC2010"
 COMPSUFFIX	= bcc10_
 !endif
@@ -148,13 +166,18 @@ QT_LIBS			= QtSql$(LIBSUFFIX)4.lib QtCore$(LIBSUFFIX)4.lib
 
 CPPFLAGS		= $(CPPFLAGS) -I"$(includedir)"
 ICECPPFLAGS		= -I"$(slicedir)"
-SLICE2CPPFLAGS		= $(ICECPPFLAGS)
+SLICE2CPPFLAGS		= $(ICECPPFLAGS) $(SLICE2CPPFLAGS)
 
+!if "$(WINRT)" != "yes"
 !if "$(ice_src_dist)" != ""
 LDFLAGS			= $(LDFLAGS) $(PRELIBPATH)"$(libdir)"
 !else
 LDFLAGS			= $(LDFLAGS) $(PRELIBPATH)"$(ice_dir)\lib$(libsuff)"
 !endif
+!else
+LDFLAGS			= $(LDFLAGS) $(PRELIBPATH)"$(SDK_LIBRARY_PATH)"
+!endif
+
 LDFLAGS			= $(LDFLAGS) $(LDPLATFORMFLAGS) $(CXXFLAGS)
 
 !if "$(ice_src_dist)" != ""
@@ -167,12 +190,21 @@ SLICE2CPP		= $(ice_dir)\bin$(x64suffix)\slice2cpp.exe
 SLICE2FREEZE		= $(ice_dir)\bin$(x64suffix)\slice2freeze.exe
 !endif
 
+#
+# In WinRT tests we don't want a dependency on SLICEPARSELIB, as we can build all 
+# test configurations using the same slice2cpp and slice.lib.
+#
+!if "$(WINRT)" == "yes"
+SLICEPARSERLIB	= $(SLICE2CPP)
+!endif
+
 MT 			= mt.exe
 
-EVERYTHING		= all clean install
+EVERYTHING		= all clean install depend
 
 .SUFFIXES:
-.SUFFIXES:		.ice .cpp .c .obj .res .rc
+.SUFFIXES:		.ice .cpp .c .obj .res .rc .h .depend
+
 
 .cpp.obj::
 	$(CXX) /c $(CPPFLAGS) $(CXXFLAGS) $<
@@ -180,7 +212,6 @@ EVERYTHING		= all clean install
 .c.obj:
 	$(CC) /c $(CPPFLAGS) $(CFLAGS) $<
 
-
 {$(SDIR)\}.ice{$(HDIR)}.h:
 	del /q $(HDIR)\$(*F).h $(*F).cpp
 	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $<
@@ -190,6 +221,35 @@ EVERYTHING		= all clean install
 	del /q $(*F).h $(*F).cpp
 	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $(*F).ice
 
+!if "$(WINRT)" == "yes"
+
+{..}.cpp{$(ARCH)\$(CONFIG)\}.obj::
+	@if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG)
+	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $<
+
+{$(SDIR)\}.ice{..}.cpp:
+	@echo f
+	del /q $(HDIR)\$(*F).h ..\$(*F).cpp
+	"$(SLICE2CPP)" $(SLICE2CPPFLAGS) $<
+	move $(*F).h $(HDIR)
+	move $(*F).cpp ..
+
+!if "$(SRCS)" != ""
+SRCS_DEPEND 	= $(SRCS:.cpp=.depend)
+!endif
+
+!if "$(INCLUDE_DIR)" != ""
+.h{$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\}.h:
+	copy $(*F).h $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)
+
+$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR):
+	mkdir $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)
+
+all:: $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)
+!endif
+
+!endif
+
 .rc.res:
 	rc $(RCFLAGS) $<
 
@@ -203,6 +263,8 @@ clean::
 
 !endif
 
+!if "$(WINRT)" != "yes"
+
 # Suffix set, we're using a debug build.
 !if "$(LIBSUFFIX)" != ""
 
@@ -232,7 +294,11 @@ clean::
 
 !endif
 
+!endif 
+
 clean::
 	-del /q *.obj *.bak *.ilk *.exp *.pdb *.tds *.idb
 
 install::
+
+depend::
+\ No newline at end of file
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc
index 648d26bbe41..b867c27666a 100755
--- a/cpp/config/Make.rules.msvc
+++ b/cpp/config/Make.rules.msvc
@@ -1,86 +1,225 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-#
-# This file is included by Make.rules.mak when using a Microsoft C++
-# compiler
-#
-
-CXX		= cl.exe
-CC		= cl.exe
-LINK 		= link.exe
-AR 		= lib.exe
-RC		= rc.exe
-
-BASE		= /base
-PREOUT		= /out:
-PRELIBS		=
-PRELIBPATH      = /LIBPATH:
-
-!if "$(OPTIMIZE)" != "yes" || "$(RELEASEPDBS)" == "yes"
-GENERATE_PDB	= yes
-!endif
-
-CPPFLAGS	= $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc -FD -D_CONSOLE
-!if "$(CPP_COMPILER)" != "VC60"
-CPPFLAGS        = $(CPPFLAGS) -MP
-!endif
-
-!if "$(OPTIMIZE)" == "yes"
-
-CPPFLAGS	= $(CPPFLAGS) -O2 -DNDEBUG -MD
-
-!else
-
-CPPFLAGS	= $(CPPFLAGS) -Zi -Od -D_DEBUG -MDd
-
-!if "$(CPP_COMPILER)" == "VC60"
-CPPFLAGS        = $(CPPFLAGS) -GZ -Gm
-!else
-CPPFLAGS        = $(CPPFLAGS) -RTC1
-!endif
-
-!endif
-
-!if "$(STATICLIBS)" == "yes"
-CPPFLAGS        = $(CPPFLAGS) -DICE_STATIC_LIBS
-!endif
-
-LDFLAGS		= $(LDFLAGS) /nologo /FIXED:no
-
-!if "$(OPTIMIZE)" != "yes"
-
-LDFLAGS		= $(LDFLAGS) /debug
-!if "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC100_EXPRESS" 
-LDFLAGS         = $(LDFLAGS) /incremental:yes
-!endif
-
-!else
-
-LDFLAGS         = $(LDFLAGS) /OPT:REF
-!if "$(GENERATE_PDB)" != "yes"
-LDFLAGS         = $(LDFLAGS) /pdb:none
-!else
-LDFLAGS         = $(LDFLAGS) /debug
-!endif
-
-!endif
-
-LD_DLLFLAGS	= $(LDFLAGS) /dll
-LD_EXEFLAGS	= $(LDFLAGS)
-
-ICE_OS_LIBS     = rpcrt4.lib advapi32.lib
-
-BASELIBS	= iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS)
-LIBS		= ice$(LIBSUFFIX).lib $(BASELIBS)
-
-BZIP2_LIBS      = libbz2$(LIBSUFFIX).lib
-DB_LIBS         = libdb48$(LIBSUFFIX).lib
-MCPP_LIBS       = mcpp$(LIBSUFFIX).lib
-ICONV_LIB       = libiconv.lib
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+#
+# This file is included by Make.rules.mak when using a Microsoft C++
+# compiler
+#
+
+CXX		= cl.exe
+CC		= cl.exe
+LINK 		= link.exe
+AR 		= lib.exe
+RC		= rc.exe
+
+BASE		= /base
+PREOUT		= /out:
+PRELIBS		=
+PRELIBPATH      = /LIBPATH:
+
+!if "$(OPTIMIZE)" != "yes" || "$(RELEASEPDBS)" == "yes"
+GENERATE_PDB	= yes
+!endif
+
+CPPFLAGS	= $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc
+ARFLAGS	= $(ARFLAGS) -nologo -WX 
+
+!if "$(WINRT)" == "yes"
+CPPFLAGS	= $(CPPFLAGS) -DWINAPI_FAMILY=2 -Gm- -Oy- -Gd -ZW -D_UNICODE -DUNICODE
+#
+# We ignore these two warnings
+# 4264 http://msdn.microsoft.com/en-us/library/windows/apps/hh771041(v=vs.110).aspx
+# 4221 is "This object file does not define any previously undefined public symbols", 
+#
+ARFLAGS	= $(ARFLAGS) /ignore:4264 /ignore:4221
+!else
+CPPFLAGS	= $(CPPFLAGS) -D_CONSOLE
+!endif
+
+!if "$(CPP_COMPILER)" != "VC60"
+CPPFLAGS        = $(CPPFLAGS) -MP
+!endif
+
+!if "$(OPTIMIZE)" == "yes"
+
+CPPFLAGS	= $(CPPFLAGS) -O2 -DNDEBUG -MD
+ARFLAGS	= $(ARFLAGS) /LTCG
+CONFIG		= Retail	
+
+!else
+
+CPPFLAGS	= $(CPPFLAGS) -Zi -Od -D_DEBUG -MDd
+CONFIG		= Debug
+
+!if "$(CPP_COMPILER)" == "VC60"
+CPPFLAGS        = $(CPPFLAGS) -GZ -Gm
+!else
+CPPFLAGS        = $(CPPFLAGS) -RTC1
+!endif
+
+!endif
+
+!if "$(STATICLIBS)" == "yes"
+CPPFLAGS        = $(CPPFLAGS) -DICE_STATIC_LIBS
+!endif
+
+LDFLAGS		= $(LDFLAGS) /nologo
+
+!if "$(WINRT)" == "yes"
+LDFLAGS		= $(LDFLAGS) /NXCOMPAT /MANIFEST:NO /APPCONTAINER /NOLOGO 
+
+!if "$(OPTIMIZE)" != "yes"
+LDFLAGS		= $(LDFLAGS) /debug
+!else
+LDFLAGS         = $(LDFLAGS) /OPT:REF
+!if "$(GENERATE_PDB)" != "yes"
+LDFLAGS         = $(LDFLAGS) /pdb:none
+!else
+LDFLAGS         = $(LDFLAGS) /debug
+!endif
+!endif
+
+!else
+LDFLAGS		= $(LDFLAGS) /FIXED:no
+!if "$(OPTIMIZE)" != "yes"
+
+LDFLAGS		= $(LDFLAGS) /debug
+!if "$(CPP_COMPILER)" != "VC100" && "$(CPP_COMPILER)" != "VC100_EXPRESS" 
+LDFLAGS         = $(LDFLAGS) /incremental:yes
+!endif
+
+!else
+
+LDFLAGS         = $(LDFLAGS) /OPT:REF
+!if "$(GENERATE_PDB)" != "yes"
+LDFLAGS         = $(LDFLAGS) /pdb:none
+!else
+LDFLAGS         = $(LDFLAGS) /debug
+!endif
+
+!endif
+!endif
+
+LD_DLLFLAGS	= $(LDFLAGS) /dll
+LD_EXEFLAGS	= $(LDFLAGS)
+
+!if "$(WINRT)" == "yes"
+ICE_OS_LIBS     = kernel32.lib user32.lib
+!else
+ICE_OS_LIBS     = rpcrt4.lib advapi32.lib
+BZIP2_LIBS      = libbz2$(LIBSUFFIX).lib
+DB_LIBS         = libdb48$(LIBSUFFIX).lib
+MCPP_LIBS       = mcpp$(LIBSUFFIX).lib
+ICONV_LIB       = libiconv.lib
+!endif
+
+!if "$(WINRT)" != "yes"
+BASELIBS	= iceutil$(LIBSUFFIX).lib $(ICE_OS_LIBS)
+LIBS		= ice$(LIBSUFFIX).lib $(BASELIBS)
+!else
+BASELIBS	= iceutil.lib $(ICE_OS_LIBS)
+LIBS		= ice.lib $(BASELIBS)
+!endif
+
+!if "$(WINRT)" == "yes"
+
+SDK_VERSION			= $(SHORT_VERSION)
+SDK_NAME				= IceWinRT
+SDK_REG_FILE			= $(SDK_NAME).reg
+SDK_MANIFEST			= SDKManifest.xml
+SDK_BASE_PATH			= $(top_srcdir)\SDKs\$(SDK_NAME)\$(SDK_VERSION)
+SDK_INCLUDE_PATH		= $(SDK_BASE_PATH)\DesignTime\CommonConfiguration\Neutral\include
+SDK_LIBRARY_PATH		= $(SDK_BASE_PATH)\DesignTime\$(CONFIG)\$(ARCH)
+SDK_REFERENCES_PATH	= $(SDK_BASE_PATH)\References\$(CONFIG)\$(ARCH)
+SDK_REDIST_PATH		= $(SDK_BASE_PATH)\Redist\$(CONFIG)\$(ARCH)
+SDK_PROPS_PATH		= $(SDK_BASE_PATH)\DesignTime\CommonConfiguration\Neutral
+SDK_PROPS_FILE			= $(SDK_NAME).props
+SDK_LICENSE			= $(SDK_BASE_PATH)\LICENSE.txt
+SDK_ICE_LICENSE		= $(SDK_BASE_PATH)\ICE_LICENSE.txt
+
+
+#
+# Copy License files to SDK Root and fix line ends.
+#
+$(SDK_LICENSE) $(SDK_ICE_LICENSE):
+	type $(top_srcdir)\..\LICENSE | find "" /v > $(SDK_LICENSE)
+	type $(top_srcdir)\..\ICE_LICENSE | find "" /v > $(SDK_ICE_LICENSE)
+	
+$(SDK_BASE_PATH):
+	mkdir $(SDK_BASE_PATH)
+	
+$(SDK_LIBRARY_PATH):
+	mkdir $(SDK_LIBRARY_PATH)
+
+$(SDK_REDIST_PATH):
+	mkdir $(SDK_REDIST_PATH)
+	
+$(SDK_REFERENCES_PATH):
+	mkdir $(SDK_REFERENCES_PATH)
+	
+$(SDK_PROPS_PATH):
+	mkdir $(SDK_PROPS_PATH)
+
+$(SDK_INCLUDE_PATH):
+	mkdir $(SDK_INCLUDE_PATH)
+	
+$(SDK_BASE_PATH)\$(SDK_MANIFEST): $(SDK_BASE_PATH)
+        @echo <<$(SDK_MANIFEST)
+<FileList
+  Identity = "$(SDK_NAME), Version=$(SDK_VERSION)"
+  DisplayName = "$(SDK_NAME) SDK"
+  ProductFamiliyName = "ZeroC SDKs"
+  MinVSVersion = "11.0"
+  AppliesTo = "WindowsAppContainer +(VisualC | VB | CSharp)"
+  SupportedArchitecture = "x86;x64"
+  TargetFramework = ".NET for Metro Style, version=v4.5;"
+  SupportsMultipleVersion = "Error"
+  MoreInfo = "http://doc.zeroc.com">
+</FileList>
+<<KEEP
+	move $(SDK_MANIFEST) $(SDK_BASE_PATH)
+	
+$(SDK_PROPS_PATH)\$(SDK_PROPS_FILE): $(SDK_PROPS_PATH)
+	@echo <<$(SDK_PROPS_FILE)
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$$(Configuration)' == 'Debug'">
+        <ConfigurationPrefix>Debug</ConfigurationPrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$$(Configuration)' == 'Release'">
+        <ConfigurationPrefix>Retail</ConfigurationPrefix>
+  </PropertyGroup>
+  <ItemGroup>
+        <BuildMacro Include="ConfigurationPrefix">
+            <Value>$(ConfigurationPrefix)</Value>
+            <EnvironmentVariable>true</EnvironmentVariable>
+        </BuildMacro>
+  </ItemGroup>
+  <PropertyGroup>
+    <IceWinRTHome>$$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\$(SDK_NAME)\$(SDK_VERSION)@)</IceWinRTHome>
+    <IncludePath>$$(IceWinRTHome)\Designtime\CommonConfiguration\Neutral\include;$$(IncludePath)</IncludePath>
+    <LibraryPath>$$(IceWinRTHome)\Designtime\$$(ConfigurationPrefix)\$$(PlatformTarget);$$(LibraryPath)</LibraryPath> 
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>icegrid.lib;icestorm.lib;glacier2.lib;ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
+<<KEEP
+	move $(SDK_PROPS_FILE) $(SDK_PROPS_PATH)
+
+$(ARCH)\$(CONFIG):
+	mkdir $(ARCH)\$(CONFIG)
+	
+sdks: $(SDK_LIBRARY_PATH) $(SDK_REDIST_PATH) $(SDK_REFERENCES_PATH) $(SDK_BASE_PATH)\$(SDK_MANIFEST) \
+	$(SDK_PROPS_PATH)\$(SDK_PROPS_FILE) $(SDK_INCLUDE_PATH) $(ARCH)\$(CONFIG) $(SDK_LICENSE) $(SDK_ICE_LICENSE)
+
+
+!endif
+
diff --git a/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj b/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj
index 671244e67a5..15a3f507fce 100644
--- a/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj
+++ b/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="dummy.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">IntLongMap.h;IntLongMap.cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">IntLongMap.h;IntLongMap.cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">IntLongMap.h;IntLongMap.cpp;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict IntLongMap,int,long IntLongMap
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">IntLongMap.h;IntLongMap.cpp;%(Outputs)</Outputs>
     </CustomBuild>
@@ -235,7 +235,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj.filters b/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj.filters
index 2ee0e73a46f..02b63846202 100644
--- a/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj.filters
+++ b/cpp/demo/Freeze/backup/Freeze.backup.client.vcxproj.filters
@@ -35,6 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="dummy.ice">
diff --git a/cpp/demo/Freeze/bench/Freeze.bench.client.vcxproj b/cpp/demo/Freeze/bench/Freeze.bench.client.vcxproj
index ecceb75e397..712a43e0643 100644
--- a/cpp/demo/Freeze/bench/Freeze.bench.client.vcxproj
+++ b/cpp/demo/Freeze/bench/Freeze.bench.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Test.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">BenchTypes.cpp;BenchTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">BenchTypes.cpp;BenchTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">BenchTypes.cpp;BenchTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::IntIntMap,int,int --dict Demo::Struct1Struct2Map,Demo::Struct1,Demo::Struct2  --dict Demo::Struct1Class1Map,Demo::Struct1,Demo::Class1  --dict Demo::Struct1ObjectMap,Demo::Struct1,Object          --dict Demo::IndexedIntIntMap,int,int --dict-index Demo::IndexedIntIntMap          --dict Demo::IndexedStruct1Struct2Map,Demo::Struct1,Demo::Struct2          --dict-index Demo::IndexedStruct1Struct2Map,s,case-insensitive          --dict-index Demo::IndexedStruct1Struct2Map,s1          --dict Demo::IndexedStruct1Class1Map,Demo::Struct1,Demo::Class1          --dict-index Demo::IndexedStruct1Class1Map,s,case-sensitive BenchTypes Test.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">BenchTypes.cpp;BenchTypes.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -234,7 +234,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj b/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj
index d91204c7130..3301c606c69 100644
--- a/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj
+++ b/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj.filters b/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj.filters
index a769b5c5d8d..c8ff2e0268e 100644
--- a/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj.filters
+++ b/cpp/demo/Freeze/casino/Freeze.casino.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj b/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj
index 9edbafc2d68..3257932e517 100644
--- a/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj
+++ b/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -246,7 +246,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj.filters b/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj.filters
index 0aa7c91ad26..405c585a55c 100644
--- a/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj.filters
+++ b/cpp/demo/Freeze/casino/Freeze.casino.server.vcxproj.filters
@@ -65,5 +65,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj
index 287a6e720ef..91b768ecb25 100644
--- a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj
+++ b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj.filters b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj.filters
index 697644cf57f..ca6190934d7 100644
--- a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj.filters
+++ b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj
index bb99e888fff..86e58cc751d 100644
--- a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj
+++ b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -251,16 +251,16 @@
   <ItemGroup>
     <None Include="Item.ice" />
     <CustomBuild Include="ItemInfo.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Database.cpp;Database.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Database.cpp;Database.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Database.cpp;Database.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Database,string,Warehouse::ItemInfo Database ItemInfo.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Database.cpp;Database.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -272,7 +272,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj.filters b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj.filters
index ce8b30e591b..86e914a1862 100644
--- a/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj.filters
+++ b/cpp/demo/Freeze/customEvictor/Freeze.customEvictor.server.vcxproj.filters
@@ -71,6 +71,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ItemInfo.ice">
diff --git a/cpp/demo/Freeze/library/Freeze.library.client.vcxproj b/cpp/demo/Freeze/library/Freeze.library.client.vcxproj
index 291fbbffff6..3e3239a1458 100644
--- a/cpp/demo/Freeze/library/Freeze.library.client.vcxproj
+++ b/cpp/demo/Freeze/library/Freeze.library.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -266,7 +266,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/library/Freeze.library.client.vcxproj.filters b/cpp/demo/Freeze/library/Freeze.library.client.vcxproj.filters
index 6adf52bf19e..d92b54fc2da 100644
--- a/cpp/demo/Freeze/library/Freeze.library.client.vcxproj.filters
+++ b/cpp/demo/Freeze/library/Freeze.library.client.vcxproj.filters
@@ -47,5 +47,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj b/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj
index 14259dc4789..200c71dbdf2 100644
--- a/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj
+++ b/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -286,16 +286,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Library.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -307,7 +307,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj.filters b/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj.filters
index 7358aee37b2..6ead9116bf2 100644
--- a/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj.filters
+++ b/cpp/demo/Freeze/library/Freeze.library.collocated.vcxproj.filters
@@ -65,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config.collocated" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Library.ice">
diff --git a/cpp/demo/Freeze/library/Freeze.library.server.vcxproj b/cpp/demo/Freeze/library/Freeze.library.server.vcxproj
index 96dc459b06e..f19a905e7fc 100644
--- a/cpp/demo/Freeze/library/Freeze.library.server.vcxproj
+++ b/cpp/demo/Freeze/library/Freeze.library.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,16 +228,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Library.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)/slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)/slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --ice -I"$(IceHome)\slice" --dict StringIsbnSeqDict,string,Ice::StringSeq LibraryTypes "$(IceHome)\slice/Ice/BuiltinSequences.ice" Library.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">LibraryTypes.cpp;LibraryTypes.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -255,7 +255,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/library/Freeze.library.server.vcxproj.filters b/cpp/demo/Freeze/library/Freeze.library.server.vcxproj.filters
index d312463b779..3572480630b 100644
--- a/cpp/demo/Freeze/library/Freeze.library.server.vcxproj.filters
+++ b/cpp/demo/Freeze/library/Freeze.library.server.vcxproj.filters
@@ -47,6 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="Library.ice">
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj b/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj
index 06a8a67dc6e..449b10ffb8f 100644
--- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj
+++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -267,7 +267,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj.filters b/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj.filters
index db56b5a09b3..bd31d551116 100644
--- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj.filters
+++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.client.vcxproj.filters
@@ -50,5 +50,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcxproj b/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcxproj
index 345c367c3ce..855f91df655 100644
--- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcxproj
+++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.collocated.vcxproj
@@ -286,16 +286,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="PhoneBook.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
     </CustomBuild>
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj
index 6d27cf8ab90..6d685e56173 100644
--- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj
+++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -228,16 +228,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="PhoneBook.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" --index NameIndex,Demo::Contact,name,case-insensitive NameIndex PhoneBook.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NameIndex.cpp;NameIndex.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -255,7 +255,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj.filters b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj.filters
index e47dc1aad9f..835ca65b50e 100644
--- a/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj.filters
+++ b/cpp/demo/Freeze/phonebook/Freeze.phonebook.server.vcxproj.filters
@@ -47,6 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="PhoneBook.ice">
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.create.vcxproj b/cpp/demo/Freeze/transform/Freeze.transform.create.vcxproj
index 4012a53b1a1..c8d51eb6890 100644
--- a/cpp/demo/Freeze/transform/Freeze.transform.create.vcxproj
+++ b/cpp/demo/Freeze/transform/Freeze.transform.create.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ContactData.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -234,7 +234,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.read.vcxproj b/cpp/demo/Freeze/transform/Freeze.transform.read.vcxproj
index 60850b35d52..ff712bcc215 100644
--- a/cpp/demo/Freeze/transform/Freeze.transform.read.vcxproj
+++ b/cpp/demo/Freeze/transform/Freeze.transform.read.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="ContactData.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::Contacts,string,Demo::ContactData,sort --dict-index Demo::Contacts,phoneNumber,sort Contacts ContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Contacts.cpp;Contacts.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -240,7 +240,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcxproj b/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcxproj
index b4de0841ac1..72831d4bb4c 100644
--- a/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcxproj
+++ b/cpp/demo/Freeze/transform/Freeze.transform.readnew.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="NewContactData.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -240,7 +240,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcxproj b/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcxproj
index 52bb1a1ce15..05e153c349d 100644
--- a/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcxproj
+++ b/cpp/demo/Freeze/transform/Freeze.transform.recreate.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceXML.lib;Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -214,16 +214,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="NewContactData.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" --dict Demo::NewContacts,string,Demo::ContactData,sort --dict-index Demo::NewContacts,phoneNumber,sort NewContacts NewContactData.ice
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NewContacts.cpp;NewContacts.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -240,7 +240,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj b/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj
index f3f231475f2..580f3970b50 100644
--- a/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj
+++ b/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2d.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2d.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj.filters b/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj.filters
index dad6e02c449..7783a2c2786 100644
--- a/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj.filters
+++ b/cpp/demo/Glacier2/callback/Glacier2.callback.client.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj b/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj
index 2853e5ea7aa..53f4a899c8e 100644
--- a/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj
+++ b/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2d.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Glacier2d.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj.filters b/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj.filters
index 8fdf2c91484..a1e3e6d30fb 100644
--- a/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj.filters
+++ b/cpp/demo/Glacier2/callback/Glacier2.callback.server.vcxproj.filters
@@ -38,5 +38,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
+    <None Include="config.glacier2" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj b/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj
index a0acdf070fc..4ce296afb62 100644
--- a/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj
+++ b/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj.filters b/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj.filters
index 807c738d159..752905a97dc 100644
--- a/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj.filters
+++ b/cpp/demo/Glacier2/chat/Glacier2.chat.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj b/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj
index 15dc845bfc1..e992d264939 100644
--- a/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj
+++ b/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj.filters b/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj.filters
index 25950b069bb..af8527aa5a6 100644
--- a/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj.filters
+++ b/cpp/demo/Glacier2/chat/Glacier2.chat.server.vcxproj.filters
@@ -38,5 +38,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
+    <None Include="config.glacier2" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Glacier2/chat/config.glacier2 b/cpp/demo/Glacier2/chat/config.glacier2
index 5df531f7d1a..be4dc83684a 100644
--- a/cpp/demo/Glacier2/chat/config.glacier2
+++ b/cpp/demo/Glacier2/chat/config.glacier2
@@ -7,7 +7,7 @@ Glacier2.InstanceName=DemoGlacier2
 # The client-visible endpoint of Glacier2. This should be an endpoint
 # visible from the public Internet, and it should be secure.
 # 
-Glacier2.Client.Endpoints=ssl -p 4064 -h localhost
+Glacier2.Client.Endpoints=ssl -p 4064 -h 127.0.0.1
 
 #
 # The server-visible endpoint of Glacier2. This endpoint is only
@@ -52,3 +52,10 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
 IceSSL.KeyFile=s_rsa1024_priv.pem
+
+#
+# Verify the client certificate by default. Uncomment this property
+# setting if you run the demo with a client which doesn't support
+# client certificates (such as a Metro Style App client for example).
+#
+#IceSSL.VerifyPeer=0
diff --git a/cpp/demo/Glacier2/winrt/chat/.gitignore b/cpp/demo/Glacier2/winrt/chat/.gitignore
new file mode 100644
index 00000000000..f56e0045c9f
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/.gitignore
@@ -0,0 +1,5 @@
+Debug/*
+Release/*
+Chat.cpp
+Chat.h
+ipch
diff --git a/cpp/demo/Glacier2/winrt/chat/App.xaml b/cpp/demo/Glacier2/winrt/chat/App.xaml
new file mode 100644
index 00000000000..19c09a1e76a
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/App.xaml
@@ -0,0 +1,48 @@
+<Application
+    x:Class="chat.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:chat">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <!-- 
+                    Styles that define common aspects of the platform look and feel
+                    Required by Visual Studio project and item templates
+                 -->
+                <ResourceDictionary Source="Common/StandardStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="TitleStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+            </Style>
+            <Style x:Key="LabelStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="18" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="OutputStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="Black" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="H1Style" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="36" />
+                <Setter Property="Margin" Value="0,0,0,25" />
+            </Style>
+            <Style x:Key="FooterStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="Margin" Value="0,8,0,0" />
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/cpp/demo/Glacier2/winrt/chat/App.xaml.cpp b/cpp/demo/Glacier2/winrt/chat/App.xaml.cpp
new file mode 100644
index 00000000000..f551ed4bccb
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/App.xaml.cpp
@@ -0,0 +1,83 @@
+//
+// App.xaml.cpp
+// Implementation of the App class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace chat;
+
+using namespace Platform;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Interop;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+	InitializeComponent();
+	Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used when the application is launched to open a specific file, to display
+/// search results, and so forth.
+/// </summary>
+/// <param name="pArgs">Details about the launch request and process.</param>
+void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs)
+{
+	// Do not repeat app initialization when already running, just ensure that
+	// the window is active
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running)
+	{
+		Window::Current->Activate();
+		return;
+	}
+
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated)
+	{
+		//TODO: Load state from previously suspended application
+	}
+
+	// Create a Frame to act navigation context and navigate to the first page
+	auto rootFrame = ref new Frame();
+	if (!rootFrame->Navigate(TypeName(MainPage::typeid)))
+	{
+		throw ref new FailureException("Failed to create initial page");
+	}
+
+	// Place the frame in the current Window and ensure that it is active
+	Window::Current->Content = rootFrame;
+	Window::Current->Activate();
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="sender">The source of the suspend request.</param>
+/// <param name="e">Details about the suspend request.</param>
+void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
+{
+	(void) sender;	// Unused parameter
+	(void) e;	// Unused parameter
+
+	//TODO: Save application state and stop any background activity
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/App.xaml.h b/cpp/demo/Glacier2/winrt/chat/App.xaml.h
new file mode 100644
index 00000000000..779bf1490be
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/App.xaml.h
@@ -0,0 +1,24 @@
+//
+// App.xaml.h
+// Declaration of the App class.
+//
+
+#pragma once
+
+#include "App.g.h"
+
+namespace chat
+{
+	/// <summary>
+	/// Provides application-specific behavior to supplement the default Application class.
+	/// </summary>
+	ref class App sealed
+	{
+	public:
+		App();
+		virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override;
+
+	private:
+		void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
+	};
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/Assets/Logo.png b/cpp/demo/Glacier2/winrt/chat/Assets/Logo.png
new file mode 100644
index 00000000000..e26771cb33a
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Assets/Logo.png
diff --git a/cpp/demo/Glacier2/winrt/chat/Assets/SmallLogo.png b/cpp/demo/Glacier2/winrt/chat/Assets/SmallLogo.png
new file mode 100644
index 00000000000..1eb0d9d528c
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Assets/SmallLogo.png
diff --git a/cpp/demo/Glacier2/winrt/chat/Assets/SplashScreen.png b/cpp/demo/Glacier2/winrt/chat/Assets/SplashScreen.png
new file mode 100644
index 00000000000..c951e031bdf
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Assets/SplashScreen.png
diff --git a/cpp/demo/Glacier2/winrt/chat/Assets/StoreLogo.png b/cpp/demo/Glacier2/winrt/chat/Assets/StoreLogo.png
new file mode 100644
index 00000000000..dcb672712c6
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Assets/StoreLogo.png
diff --git a/cpp/demo/Glacier2/winrt/chat/Chat.ice b/cpp/demo/Glacier2/winrt/chat/Chat.ice
new file mode 100644
index 00000000000..235449c4188
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Chat.ice
@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
+
+#include <Glacier2/Session.ice>
+
+module Demo
+{
+
+interface ChatCallback
+{
+    ["ami"] void message(string data);
+};
+
+interface ChatSession extends Glacier2::Session
+{
+    void setCallback(ChatCallback* callback);
+    void say(string data);
+};
+
+};
diff --git a/cpp/demo/Glacier2/winrt/chat/ChatView.xaml b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml
new file mode 100644
index 00000000000..65a80877f0e
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml
@@ -0,0 +1,38 @@
+<Page
+    x:Class="chat.ChatView"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:chat"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"></RowDefinition>
+            <RowDefinition Height="auto"></RowDefinition>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition></ColumnDefinition>
+        </Grid.ColumnDefinitions>
+
+
+        <Border Grid.Row="0" Padding="5, 5, 5, 5" BorderBrush="Gray"
+                Margin="5, 0, 0, 0" BorderThickness="5" CornerRadius="5">
+            <Border Background="{StaticResource TextBoxButtonPointerOverBackgroundThemeBrush}">
+                <ScrollViewer x:Name="Scroller"  VerticalScrollBarVisibility="Auto" 
+                        HorizontalScrollBarVisibility="Disabled" 
+                        Width="Auto" Height="Auto"
+                        ZoomMode="Disabled">
+                    <TextBlock x:Name="messages" Style="{StaticResource OutputStyle}" Padding="5, 5, 5, 5" TextWrapping="Wrap"/>
+                </ScrollViewer>
+            </Border>
+        </Border>
+        <Border Grid.Row="1" Padding="5, 5, 5, 5" BorderThickness="5" BorderBrush="Gray" 
+                Margin="0, 5, 0, 0" CornerRadius="5">
+            <TextBox x:Name="input" TextWrapping="Wrap" KeyDown="inputKeyDown"/>
+        </Border>
+    </Grid>
+</Page>
+\ No newline at end of file
diff --git a/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp
new file mode 100644
index 00000000000..a9c505c2aae
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.cpp
@@ -0,0 +1,65 @@
+//
+// ChatView.xaml.cpp
+// Implementation of the ChatView class
+//
+
+#include "pch.h"
+#include "ChatView.xaml.h"
+#include "MainPage.xaml.h"
+#include <string>
+
+using namespace chat;
+using namespace std;
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+ChatView::ChatView()
+{
+    InitializeComponent();
+    MainPage::instance()->_chatView = this;
+}
+
+void
+ChatView::setError(String^ err)
+{
+    appendMessage(L"<system-message> " + err);
+}
+
+void 
+ChatView::appendMessage(String^ message)
+{
+    messages->Text += message + L"\n";
+    messages->UpdateLayout();
+    Scroller->ScrollToVerticalOffset(Scroller->ScrollableHeight);
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void ChatView::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    (void) e;	// Unused parameter
+}
+
+
+void chat::ChatView::inputKeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e)
+{
+    if(e->Key == Windows::System::VirtualKey::Enter && !input->Text->IsEmpty())
+    {
+        string msg = IceUtil::wstringToString(input->Text->Data());
+        input->Text = ref new String();
+        MainPage::instance()->coordinator()->say(msg);
+    }
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.h b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.h
new file mode 100644
index 00000000000..15de1de2aea
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/ChatView.xaml.h
@@ -0,0 +1,33 @@
+//
+// ChatView.xaml.h
+// Declaration of the ChatView class
+//
+
+#pragma once
+
+#include "ChatView.g.h"
+
+namespace chat
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public ref class ChatView sealed
+    {
+    public:
+        
+        ChatView();
+
+        void setError(Platform::String^ err);
+
+        void appendMessage(Platform::String^ message);
+
+    protected:
+        
+        virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+        
+    private:
+        
+        void inputKeyDown(Platform::Object^ sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e);
+    };
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/Common/StandardStyles.xaml b/cpp/demo/Glacier2/winrt/chat/Common/StandardStyles.xaml
new file mode 100644
index 00000000000..1937eb76021
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Common/StandardStyles.xaml
@@ -0,0 +1,1007 @@
+<!--
+    This file contains XAML styles that simplify application development.
+
+    These are not merely convenient, but are required by most Visual Studio project and item templates.
+    Removing, renaming, or otherwise modifying the content of these files may result in a project that
+    does not build, or that will not build once additional pages are added.  If variations on these
+    styles are desired it is recommended that you copy the content under a new name and modify your
+    private copy.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Non-brush values that vary across themes -->
+    
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <x:String x:Key="BackButtonGlyph">&#xE071;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0BA;</x:String>
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <x:String x:Key="BackButtonGlyph">&#xE0A6;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0C4;</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- RichTextBlock styles -->
+
+    <Style x:Key="BasicRichTextStyle" TargetType="RichTextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BasicRichTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ItemRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"/>
+
+    <Style x:Key="BodyRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <!-- TextBlock styles -->
+
+    <Style x:Key="BasicTextStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BasicTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="HeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="40"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-2" Y="8"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="26.667"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="30"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="6"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+
+    <Style x:Key="ItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"/>
+
+    <Style x:Key="BodyTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <Style x:Key="CaptionTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+    </Style>
+
+    <!-- Button styles -->
+
+    <!--
+        TextButtonStyle is used to style a Button using subheader-styled text with no other adornment.  This
+        style is used in the GroupedItemsPage as a group header and in the FileOpenPickerPage for triggering
+        commands.
+    -->
+    <Style x:Key="TextButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        TextRadioButtonStyle is used to style a RadioButton using subheader-styled text with no other adornment.
+        This style is used in the SearchResultsPage to allow selection among filters.
+    -->
+    <Style x:Key="TextRadioButtonStyle" TargetType="RadioButton">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Margin" Value="0,0,30,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked"/>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        AppBarButtonStyle is used to style a Button for use in an App Bar.  Content will be centered and should fit within
+        the 40-pixel radius glyph provided.  16-point Segoe UI Symbol is used for content text to simplify the use of glyphs
+        from that font.  AutomationProperties.Name is used for the text below the glyph.
+    -->
+    <Style x:Key="AppBarButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="AutomationProperties.ItemType" Value="App Bar Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="100" Background="Transparent">
+                        <StackPanel VerticalAlignment="Top" Margin="0,12,0,11">
+                            <Grid Width="40" Height="40" Margin="0,0,0,5" HorizontalAlignment="Center">
+                                <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0" Foreground="{StaticResource AppBarItemBackgroundThemeBrush}"/>
+                                <TextBlock x:Name="OutlineGlyph" Text="&#xE0A7;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0"/>
+                                <ContentPresenter x:Name="Content" HorizontalAlignment="Center" Margin="-1,-1,0,0" VerticalAlignment="Center"/>
+                            </Grid>
+                            <TextBlock
+                                x:Name="TextLabel"
+                                Text="{TemplateBinding AutomationProperties.Name}"
+                                Foreground="{StaticResource AppBarItemForegroundThemeBrush}"
+                                Margin="0,0,2,0"
+                                FontSize="12"
+                                TextAlignment="Center"
+                                Width="88"
+                                MaxHeight="32"
+                                TextTrimming="WordEllipsis"
+                                Style="{StaticResource BasicTextStyle}"/>
+                        </StackPanel>
+                        <Rectangle
+                                x:Name="FocusVisualWhite"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="1.5"/>
+                        <Rectangle
+                                x:Name="FocusVisualBlack"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ApplicationViewStates">
+                                <VisualState x:Name="FullScreenLandscape"/>
+                                <VisualState x:Name="Filled"/>
+                                <VisualState x:Name="FullScreenPortrait">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Snapped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualWhite"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualBlack"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Standard App Bar buttons -->
+  
+    <Style x:Key="SkipBackAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipBackAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Back"/>
+        <Setter Property="Content" Value="&#xE100;"/>
+    </Style>
+    <Style x:Key="SkipAheadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipAheadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Ahead"/>
+        <Setter Property="Content" Value="&#xE101;"/>
+    </Style>
+    <Style x:Key="PlayAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PlayAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Play"/>
+        <Setter Property="Content" Value="&#xE102;"/>
+    </Style>
+    <Style x:Key="PauseAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PauseAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pause"/>
+        <Setter Property="Content" Value="&#xE103;"/>
+    </Style>
+    <Style x:Key="EditAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="EditAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Edit"/>
+        <Setter Property="Content" Value="&#xE104;"/>
+    </Style>
+    <Style x:Key="SaveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SaveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Save"/>
+        <Setter Property="Content" Value="&#xE105;"/>
+    </Style>
+    <Style x:Key="DeleteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DeleteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Delete"/>
+        <Setter Property="Content" Value="&#xE106;"/>
+    </Style>
+    <Style x:Key="DiscardAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DiscardAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Discard"/>
+        <Setter Property="Content" Value="&#xE107;"/>
+    </Style>
+    <Style x:Key="RemoveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RemoveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Remove"/>
+        <Setter Property="Content" Value="&#xE108;"/>
+    </Style>
+    <Style x:Key="AddAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="AddAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Add"/>
+        <Setter Property="Content" Value="&#xE109;"/>
+    </Style>
+    <Style x:Key="NoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="No"/>
+        <Setter Property="Content" Value="&#xE10A;"/>
+    </Style>
+    <Style x:Key="YesAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="YesAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Yes"/>
+        <Setter Property="Content" Value="&#xE10B;"/>
+    </Style>
+    <Style x:Key="MoreAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MoreAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="More"/>
+        <Setter Property="Content" Value="&#xE10C;"/>
+    </Style>
+    <Style x:Key="RedoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RedoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Redo"/>
+        <Setter Property="Content" Value="&#xE10D;"/>
+    </Style>
+    <Style x:Key="UndoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UndoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Undo"/>
+        <Setter Property="Content" Value="&#xE10E;"/>
+    </Style>
+    <Style x:Key="HomeAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HomeAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Home"/>
+        <Setter Property="Content" Value="&#xE10F;"/>
+    </Style>
+    <Style x:Key="OutAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="OutAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Out"/>
+        <Setter Property="Content" Value="&#xE110;"/>
+    </Style>
+    <Style x:Key="NextAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NextAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Next"/>
+        <Setter Property="Content" Value="&#xE111;"/>
+    </Style>
+    <Style x:Key="PreviousAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PreviousAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Previous"/>
+        <Setter Property="Content" Value="&#xE112;"/>
+    </Style>
+    <Style x:Key="FavoriteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="FavoriteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Favorite"/>
+        <Setter Property="Content" Value="&#xE113;"/>
+    </Style>
+    <Style x:Key="PhotoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PhotoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Photo"/>
+        <Setter Property="Content" Value="&#xE114;"/>
+    </Style>
+    <Style x:Key="SettingsAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SettingsAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Settings"/>
+        <Setter Property="Content" Value="&#xE115;"/>
+    </Style>
+    <Style x:Key="VideoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="VideoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Video"/>
+        <Setter Property="Content" Value="&#xE116;"/>
+    </Style>
+    <Style x:Key="RefreshAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RefreshAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Refresh"/>
+        <Setter Property="Content" Value="&#xE117;"/>
+    </Style>
+    <Style x:Key="DownloadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DownloadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Download"/>
+        <Setter Property="Content" Value="&#xE118;"/>
+    </Style>
+    <Style x:Key="MailAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MailAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Mail"/>
+        <Setter Property="Content" Value="&#xE119;"/>
+    </Style>
+    <Style x:Key="SearchAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SearchAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Search"/>
+        <Setter Property="Content" Value="&#xE11A;"/>
+    </Style>
+    <Style x:Key="HelpAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HelpAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Help"/>
+        <Setter Property="Content" Value="&#xE11B;"/>
+    </Style>
+    <Style x:Key="UploadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UploadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Upload"/>
+        <Setter Property="Content" Value="&#xE11C;"/>
+    </Style>
+    <Style x:Key="PinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pin"/>
+        <Setter Property="Content" Value="&#xE141;"/>
+    </Style>
+    <Style x:Key="UnpinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UnpinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Unpin"/>
+        <Setter Property="Content" Value="&#xE196;"/>
+    </Style>
+
+    <!-- Title area styles -->
+
+    <Style x:Key="PageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource HeaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,30,40"/>
+    </Style>
+
+    <Style x:Key="PageSubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource SubheaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,0,40"/>
+    </Style>
+
+    <Style x:Key="SnappedPageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource PageSubheaderTextStyle}">
+        <Setter Property="Margin" Value="0,0,18,40"/>
+    </Style>
+
+    <!--
+        BackButtonStyle is used to style a Button for use in the title area of a page.  Margins appropriate for
+        the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="BackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Width" Value="48"/>
+        <Setter Property="Height" Value="48"/>
+        <Setter Property="Margin" Value="36,0,36,36"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid">
+                        <Grid Margin="-1,-16,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0A6;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        PortraitBackButtonStyle is used to style a Button for use in the title area of a portrait page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="PortraitBackButtonStyle" TargetType="Button" BasedOn="{StaticResource BackButtonStyle}">
+        <Setter Property="Margin" Value="26,0,26,36"/>
+    </Style>
+
+    <!--
+        SnappedBackButtonStyle is used to style a Button for use in the title area of a snapped page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+        
+        The obvious duplication here is necessary as the glyphs used in snapped are not merely smaller versions of the same
+        glyph but are actually distinct.
+    -->
+    <Style x:Key="SnappedBackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Margin" Value="20,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="26.66667"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="36" Height="36" Margin="-3,0,7,33">
+                        <Grid Margin="-1,-1,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0D4;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonSnappedGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0C4;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Item templates -->
+
+    <!-- Grid-appropriate 250 pixel square item template as seen in the GroupedItemsPage and ItemsPage -->
+    <DataTemplate x:Key="Standard250x250ItemTemplate">
+        <Grid HorizontalAlignment="Left" Width="250" Height="250">
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel VerticalAlignment="Bottom" Background="{StaticResource ListViewItemOverlayBackgroundThemeBrush}">
+                <TextBlock Text="{Binding Title}" Foreground="{StaticResource ListViewItemOverlayForegroundThemeBrush}" Style="{StaticResource TitleTextStyle}" Height="60" Margin="15,0,15,0"/>
+                <TextBlock Text="{Binding Subtitle}" Foreground="{StaticResource ListViewItemOverlaySecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap" Margin="15,0,15,10"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 500 by 130 pixel item template as seen in the GroupDetailPage -->
+    <DataTemplate x:Key="Standard500x130ItemTemplate">
+        <Grid Height="110" Width="480" Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 130 pixel high item template as seen in the SplitPage -->
+    <DataTemplate x:Key="Standard130ItemTemplate">
+        <Grid Height="110" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!--
+        List-appropriate 80 pixel high item template as seen in the SplitPage when Filled, and
+        the following pages when snapped: GroupedItemsPage, GroupDetailPage, and ItemsPage
+    -->
+    <DataTemplate x:Key="Standard80ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="60" Height="60">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource ItemTextStyle}" MaxHeight="40"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 300 by 70 pixel item template as seen in the SearchResultsPage -->
+    <DataTemplate x:Key="StandardSmallIcon300x70ItemTemplate">
+        <Grid Width="294" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 70 pixel high item template as seen in the SearchResultsPage when Snapped -->
+    <DataTemplate x:Key="StandardSmallIcon70ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+  <!--
+      190x130 pixel item template for displaying file previews as seen in the FileOpenPickerPage
+      Includes an elaborate tooltip to display title and description text
+  -->
+  <DataTemplate x:Key="StandardFileWithTooltip190x130ItemTemplate">
+        <Grid>
+            <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image
+                    Source="{Binding Image}"
+                    Width="190"
+                    Height="130"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Stretch="Uniform"/>
+            </Grid>
+            <ToolTipService.Placement>Mouse</ToolTipService.Placement>
+            <ToolTipService.ToolTip>
+                <ToolTip>
+                    <ToolTip.Style>
+                        <Style TargetType="ToolTip">
+                            <Setter Property="BorderBrush" Value="{StaticResource ToolTipBackgroundThemeBrush}" />
+                            <Setter Property="Padding" Value="0" />
+                        </Style>
+                    </ToolTip.Style>
+
+                    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="20">
+                            <Image
+                                Source="{Binding Image}"
+                                Width="160"
+                                Height="160"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Stretch="Uniform"/>
+                        </Grid>
+                        <StackPanel Width="200" Grid.Column="1" Margin="0,20,20,20">
+                            <TextBlock Text="{Binding Title}" TextWrapping="NoWrap" Style="{StaticResource BodyTextStyle}"/>
+                            <TextBlock Text="{Binding Description}" MaxHeight="140" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource BodyTextStyle}"/>
+                        </StackPanel>
+                    </Grid>   
+                </ToolTip>                
+            </ToolTipService.ToolTip>
+        </Grid>
+    </DataTemplate>
+
+    <!-- ScrollViewer styles -->
+
+    <Style x:Key="HorizontalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <Style x:Key="VerticalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <!-- Page layout roots typically use entrance animations and a theme-appropriate background color -->
+
+    <Style x:Key="LayoutRootStyle" TargetType="Panel">
+        <Setter Property="Background" Value="{StaticResource ApplicationPageBackgroundThemeBrush}"/>
+        <Setter Property="ChildrenTransitions">
+            <Setter.Value>
+                <TransitionCollection>
+                    <EntranceThemeTransition/>
+                </TransitionCollection>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/cpp/demo/Glacier2/winrt/chat/LoginView.xaml b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml
new file mode 100644
index 00000000000..29d9519bbad
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml
@@ -0,0 +1,40 @@
+<Page
+    x:Class="chat.LoginView"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:chat"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <StackPanel VerticalAlignment="Center" Orientation="Vertical"
+                    MaxWidth="400" Margin="7,7,7,7">
+
+            <TextBlock HorizontalAlignment="Center" Style="{StaticResource LabelStyle}"
+                       TextWrapping="Wrap"
+                       Text="You can login with any username / password."/>
+            <StackPanel Orientation="Vertical">
+                <TextBlock Style="{StaticResource LabelStyle}">Host:</TextBlock>
+                <TextBox Name="hostname" Text="127.0.0.1"/>
+                <TextBlock Style="{StaticResource LabelStyle}">Username:</TextBlock>
+                <TextBox Name="username"/>
+                <TextBlock Style="{StaticResource LabelStyle}">Password:</TextBlock>
+                <PasswordBox Name="password"></PasswordBox>
+                <Border Grid.Row="0" Padding="5, 5, 5, 5" BorderBrush="Gray" Name="errorBorder" Visibility="Collapsed"
+                        Margin="0, 10, 0, 0" BorderThickness="5" CornerRadius="5">
+                    <Border Background="{StaticResource TextBoxButtonPointerOverBackgroundThemeBrush}">
+                        <ScrollViewer x:Name="Scroller"  VerticalScrollBarVisibility="Auto" 
+                        HorizontalScrollBarVisibility="Disabled" 
+                        Width="Auto" Height="Auto"
+                        ZoomMode="Disabled">
+                            <TextBlock x:Name="error" Style="{StaticResource OutputStyle}" Padding="5, 5, 5, 5" TextWrapping="Wrap"/>
+                        </ScrollViewer>
+                    </Border>
+                </Border>
+            </StackPanel>
+            <Button x:Name="signin" HorizontalAlignment="Center" Click="signinClick" Content="Sign In"/>
+        </StackPanel>
+    </Grid>
+</Page>
+\ No newline at end of file
diff --git a/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.cpp b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.cpp
new file mode 100644
index 00000000000..7afa5d9320e
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.cpp
@@ -0,0 +1,72 @@
+//
+// LoginView.xaml.cpp
+// Implementation of the LoginView class
+//
+
+#include "pch.h"
+#include "LoginView.xaml.h"
+#include "MainPage.xaml.h"
+
+using namespace chat;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+LoginView::LoginView()
+{
+    InitializeComponent();
+    MainPage::instance()->_loginView = this;
+}
+
+void
+LoginView::setError(String^ err)
+{
+    signin->IsEnabled = true;
+    errorBorder->Visibility = Windows::UI::Xaml::Visibility::Visible;
+    error->Text = err;
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void LoginView::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    LoginData loginData = MainPage::instance()->coordinator()->loginData();
+    if(!loginData.hostname.empty())
+    {
+        hostname->Text = ref new String(IceUtil::stringToWstring(loginData.hostname).c_str());
+    }
+    if(!loginData.username.empty())
+    {
+        username->Text = ref new String(IceUtil::stringToWstring(loginData.username).c_str());
+    }
+    if(!loginData.password.empty())
+    {
+        password->Password = ref new String(IceUtil::stringToWstring(loginData.password).c_str());
+    }
+    (void) e;	// Unused parameter
+}
+
+void chat::LoginView::signinClick(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    LoginData loginData;
+    loginData.hostname = IceUtil::wstringToString(hostname->Text->Data());
+    loginData.username = IceUtil::wstringToString(username->Text->Data());
+    loginData.password = IceUtil::wstringToString(password->Password->Data());
+    signin->IsEnabled = false;
+    error->Text = "";
+    errorBorder->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
+    MainPage::instance()->coordinator()->signIn(loginData);
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.h b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.h
new file mode 100644
index 00000000000..dc4e60f5118
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/LoginView.xaml.h
@@ -0,0 +1,35 @@
+//
+// LoginView.xaml.h
+// Declaration of the LoginView class
+//
+
+#pragma once
+
+#include "LoginView.g.h"
+
+namespace chat
+{
+    ref class MainPage;
+
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public ref class LoginView sealed
+    {
+    public:
+
+        LoginView();
+
+        void setError(Platform::String^ err);
+
+    protected:
+
+        virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+
+    private:
+
+        void signinClick(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+
+        friend ref class MainPage;
+    };
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/MainPage.xaml b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml
new file mode 100644
index 00000000000..f41bd856ae4
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml
@@ -0,0 +1,41 @@
+<Page
+    x:Class="chat.MainPage"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:chat"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <!-- Header -->
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="ZeroC - Glacier2 Chat Demo" Style="{StaticResource TitleStyle}"
+                       Margin="5, 5, 5, 5" Grid.Column="0"
+                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
+            <Border Padding="0,10,20,0" Grid.Column="1" >
+                <Button x:Name="signout" HorizontalAlignment="Right" Click="signoutClick" Content="Sign Out"
+                        Visibility="Collapsed"/>
+            </Border>
+        </Grid>
+        <!-- Content -->
+        <Border Grid.Row="1" Padding="20">
+            <Frame Name="main"/>
+        </Border>
+        <!-- Footer -->
+        <StackPanel Grid.Row="2" VerticalAlignment="Bottom">
+            <TextBlock Margin="5, 5, 5, 5"  Style="{StaticResource FooterStyle}" 
+                       Text="© 2012 ZeroC. All rights reserved."/>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.cpp b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.cpp
new file mode 100644
index 00000000000..20c74f86162
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.cpp
@@ -0,0 +1,243 @@
+//
+// MainPage.xaml.cpp
+// Implementation of the MainPage class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace chat;
+
+using namespace Platform;
+using namespace Windows::System;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+using namespace Windows::UI::Xaml::Interop;
+
+using namespace std;
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+MainPage^ MainPage::_instance = nullptr;
+
+class DispatcherI : virtual public Ice::Dispatcher
+{
+public:
+
+    DispatcherI(CoreDispatcher^ dispatcher) :
+        _dispatcher(dispatcher)
+    {
+    }
+
+    virtual void dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
+    {
+        _dispatcher->RunAsync(CoreDispatcherPriority::Normal, ref new DispatchedHandler([=]()
+            {
+                call->run();
+            }, CallbackContext::Any));
+    }
+
+private:
+
+    CoreDispatcher^ _dispatcher;
+};
+
+Coordinator::Coordinator(CoreDispatcher^ dispatcher) :
+    _dispatcher(dispatcher)
+{
+}
+
+void
+Coordinator::signIn(LoginData loginData)
+{
+    _loginData = loginData;
+    Ice::InitializationData id;
+    id.properties = Ice::createProperties();
+    id.dispatcher = new DispatcherI(_dispatcher);
+    Glacier2::SessionFactoryHelperPtr factory = new Glacier2::SessionFactoryHelper(id, this);
+    Ice::Identity identity;
+    identity.name = "router";
+    identity.category = "DemoGlacier2";
+    factory->setRouterIdentity(identity);
+    factory->setRouterHost(_loginData.hostname);
+    _session = factory->connect(_loginData.username, _loginData.password);
+}
+
+LoginData
+Coordinator::loginData()
+{
+    return _loginData;
+}
+
+void
+Coordinator::say(const std::string& msg)
+{
+    try
+    {
+        Demo::Callback_ChatSession_sayPtr cb = Demo::newCallback_ChatSession_say(this, &Coordinator::sayCallbackSuccess, 
+                                                                                       &Coordinator::sayCallbackError);
+        _chat->begin_say(msg, cb);
+    }
+    catch(const Ice::CommunicatorDestroyedException& ex)
+    {
+        ostringstream os;
+        os << "Connect failed:\n" << ex << endl; 
+        MainPage::instance()->setError(os.str());
+    }
+}
+
+void
+Coordinator::sayCallbackSuccess()
+{
+}
+
+void 
+Coordinator::sayCallbackError(const Ice::Exception& ex)
+{
+    ostringstream os;
+    os << "Connect failed:\n" << ex << endl; 
+    MainPage::instance()->setError(os.str());
+}
+
+void
+Coordinator::createdCommunicator(const Glacier2::SessionHelperPtr&)
+{
+}
+
+void
+Coordinator::setCallbackSuccess()
+{
+    MainPage::instance()->setConnected(true);
+}
+
+void
+Coordinator::setCallbackError(const Ice::Exception& ex)
+{
+    ostringstream os;
+    os << "Connect failed:\n" << ex << endl; 
+    MainPage::instance()->setError(os.str());
+}
+
+void
+Coordinator::connected(const Glacier2::SessionHelperPtr& session)
+{
+    if(_session != session)
+    {
+        return;
+    }
+    try
+    {
+        _chat = Demo::ChatSessionPrx::uncheckedCast(session->session());
+        Demo::Callback_ChatSession_setCallbackPtr cb = 
+            Demo::newCallback_ChatSession_setCallback(this, &Coordinator::setCallbackSuccess, &Coordinator::setCallbackError);
+        _chat->begin_setCallback(Demo::ChatCallbackPrx::uncheckedCast(_session->addWithUUID(this)), cb);
+    }
+    catch(const Ice::CommunicatorDestroyedException& ex)
+    {
+        ostringstream os;
+        os << "Connect failed:\n" << ex << endl; 
+        MainPage::instance()->setError(os.str());
+    }
+}
+
+void
+Coordinator::disconnected(const Glacier2::SessionHelperPtr&)
+{
+    MainPage::instance()->setConnected(false);
+}
+
+void
+Coordinator::connectFailed(const Glacier2::SessionHelperPtr&, const Ice::Exception& ex)
+{
+    ostringstream os;
+    os << "Connect failed:\n" << ex << endl; 
+    MainPage::instance()->setError(os.str());
+}
+ 
+void
+Coordinator::message(const string& msg, const Ice::Current&)
+{
+    try
+    {
+        MainPage::instance()->_chatView->appendMessage(ref new String(IceUtil::stringToWstring(msg).c_str()));
+    }
+    catch(const Ice::CommunicatorDestroyedException& ex)
+    {
+        ostringstream os;
+        os << ex << endl; 
+        MainPage::instance()->setError(os.str());
+    }
+}
+
+void
+Coordinator::destroy()
+{
+    if(_session)
+    {
+        _session->destroy();
+        _session = 0;
+    }
+}
+
+MainPage::MainPage()
+{
+    InitializeComponent();
+    _instance = this;
+    _coordinator = new Coordinator(this->Dispatcher);
+    setConnected(false);
+}
+
+MainPage^
+MainPage::instance()
+{
+    return _instance;
+}
+
+void
+MainPage::setConnected(bool connected)
+{
+    String^ pageName = nullptr;
+    if(connected)
+    {
+        pageName = "chat.ChatView";
+        signout->Visibility =  Windows::UI::Xaml::Visibility::Visible;
+    }
+    else
+    {
+        pageName = "chat.LoginView";
+        signout->Visibility =  Windows::UI::Xaml::Visibility::Collapsed;
+    }
+    TypeName page = {pageName, TypeKind::Custom};
+    main->Navigate(page, this);
+    _loginView->signin->IsEnabled = true;
+}
+
+void
+MainPage::setError(const std::string& err)
+{
+    setConnected(false);
+    _loginView->setError(ref new String(IceUtil::stringToWstring(err).c_str()));
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void MainPage::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    (void) e; // Unused parameter
+}
+
+void chat::MainPage::signoutClick(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    _coordinator->destroy();
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.h b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.h
new file mode 100644
index 00000000000..717930ecc99
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/MainPage.xaml.h
@@ -0,0 +1,102 @@
+//
+// MainPage.xaml.h
+// Declaration of the MainPage class.
+//
+
+#pragma once
+
+#include "MainPage.g.h"
+#include "ChatView.xaml.h"
+#include "LoginView.xaml.h"
+
+#include <Glacier2/Glacier2.h>
+#include <Chat.h>
+
+namespace chat
+{
+    struct LoginData
+    {
+        std::string hostname;
+        std::string username;
+        std::string password;
+    };
+    
+    class Coordinator : virtual public Glacier2::SessionCallback,
+                        virtual public Demo::ChatCallback
+    {
+    public:
+
+        Coordinator(Windows::UI::Core::CoreDispatcher^);
+
+        void signIn(LoginData);
+        LoginData loginData();
+        
+        //
+        //  Session callback
+        //
+        virtual void createdCommunicator(const Glacier2::SessionHelperPtr& session);
+        virtual void connected(const Glacier2::SessionHelperPtr&);
+        virtual void disconnected(const Glacier2::SessionHelperPtr&);
+        virtual void connectFailed(const Glacier2::SessionHelperPtr&, const Ice::Exception&);
+    
+        //
+        // Chat callback
+        //
+        virtual void message(const std::string& data, const Ice::Current&);
+
+        void setCallbackSuccess();
+        void setCallbackError(const Ice::Exception&);
+
+        void say(const std::string&);
+        void sayCallbackSuccess();
+        void sayCallbackError(const Ice::Exception&);
+
+        void destroy();
+
+    private:
+
+        Demo::ChatSessionPrx _chat;
+        Glacier2::SessionHelperPtr _session;
+        Windows::UI::Core::CoreDispatcher^ _dispatcher;
+        LoginData _loginData;
+    };
+    typedef IceUtil::Handle<Coordinator> CoordinatorPtr;
+
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public ref class MainPage sealed
+    {
+    public:
+
+        MainPage();
+
+        static MainPage^ instance();
+
+        void setConnected(bool);
+
+    protected:
+
+        virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+
+    private:
+        
+        virtual void setError(const std::string&);
+
+        CoordinatorPtr coordinator()
+        {
+            return _coordinator;
+        }    
+        CoordinatorPtr _coordinator;
+
+        static MainPage^ _instance;
+
+        friend ref class LoginView;
+        friend ref class ChatView;
+        friend class Coordinator;
+
+        LoginView^ _loginView;
+        ChatView^ _chatView;
+        void signoutClick(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+    };
+}
diff --git a/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest b/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest
new file mode 100644
index 00000000000..ba43d8e833a
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/Package.appxmanifest
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+  <Identity Name="46e81031-9c5b-4caa-92cb-57fbccb3dc93" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>Glacier2 Chat Demo</DisplayName>
+    <PublisherDisplayName>ZeroC</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.2.0</OSMinVersion>
+    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="chat.App">
+      <VisualElements DisplayName="Glacier2 Chat Demo" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="chat" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="privateNetworkClientServer" />
+    <Capability Name="internetClient" />
+  </Capabilities>
+  <Extensions>
+    <Extension Category="windows.certificates">
+      <Certificates>
+        <Certificate StoreName="Root" Content="cacert.pem" />
+        <Certificate StoreName="CA" Content="cacert.pem" />
+        <TrustFlags ExclusiveTrust="true" />
+      </Certificates>
+    </Extension>
+  </Extensions>
+</Package>
+\ No newline at end of file
diff --git a/cpp/demo/Glacier2/winrt/chat/README.txt b/cpp/demo/Glacier2/winrt/chat/README.txt
new file mode 100644
index 00000000000..bd7220ca690
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/README.txt
@@ -0,0 +1,12 @@
+This demo demonstrates the use of a Glacier2 session helpers and
+to create a graphical client for the simple chat server.
+
+First follow the instructions in the C++ Glacier2 chat demo 
+README to start the server and the Glacier2 router.
+
+To start the client first build the demo using "Build chat" command
+in "Build" menu.
+
+Deploy the demo using "Deploy chat" command in "Build" menu.
+
+Then start the "Glacier2 Chat Demo" application from Windows Start menu.
diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj
new file mode 100644
index 00000000000..f10b56c07e7
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{c56bdb5e-9829-49d6-b5eb-9089ad7e89cc}</ProjectGuid>
+    <RootNamespace>chat</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PackageCertificateKeyFile>key.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>22710365E93A16EA1983847965CFC340086BE8B1</PackageCertificateThumbprint>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Chat.h" />
+    <ClInclude Include="ChatView.xaml.h">
+      <DependentUpon>ChatView.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="LoginView.xaml.h">
+      <DependentUpon>LoginView.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="MainPage.xaml.h">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="ChatView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Common\StandardStyles.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="LoginView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="..\..\..\..\..\certs\cacert.pem">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="Chat.ice" />
+    <None Include="chat_TemporaryKey.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\Logo.png" />
+    <Image Include="Assets\SmallLogo.png" />
+    <Image Include="Assets\StoreLogo.png" />
+    <Image Include="Assets\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="Chat.cpp" />
+    <ClCompile Include="ChatView.xaml.cpp">
+      <DependentUpon>ChatView.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="LoginView.xaml.cpp">
+      <DependentUpon>LoginView.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="MainPage.xaml.cpp">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="IceWinRT, Version=3.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_ProjectVersion="1" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters
new file mode 100644
index 00000000000..19c667bb0b2
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/chat.vcxproj.filters
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>c56bdb5e-9829-49d6-b5eb-9089ad7e89cc</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets">
+      <UniqueIdentifier>13723f9e-afb3-465e-9f73-02f19059882b</UniqueIdentifier>
+    </Filter>
+    <Page Include="Common\StandardStyles.xaml">
+      <Filter>Common</Filter>
+    </Page>
+    <Image Include="Assets\Logo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SmallLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SplashScreen.png">
+      <Filter>Assets</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp" />
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="ChatView.xaml.cpp" />
+    <ClCompile Include="LoginView.xaml.cpp" />
+    <ClCompile Include="Chat.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h" />
+    <ClInclude Include="MainPage.xaml.h" />
+    <ClInclude Include="ChatView.xaml.h" />
+    <ClInclude Include="LoginView.xaml.h" />
+    <ClInclude Include="Chat.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="chat_TemporaryKey.pfx" />
+    <None Include="Chat.ice" />
+    <None Include="..\..\..\..\..\certs\cacert.pem" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml" />
+    <Page Include="ChatView.xaml" />
+    <Page Include="LoginView.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Glacier2/winrt/chat/pch.cpp b/cpp/demo/Glacier2/winrt/chat/pch.cpp
new file mode 100644
index 00000000000..f3963b9b14c
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/pch.cpp
@@ -0,0 +1,6 @@
+//
+// pch.cpp
+// Include the standard header and generate the precompiled header.
+//
+
+#include "pch.h"
diff --git a/cpp/demo/Glacier2/winrt/chat/pch.h b/cpp/demo/Glacier2/winrt/chat/pch.h
new file mode 100644
index 00000000000..77252482cf2
--- /dev/null
+++ b/cpp/demo/Glacier2/winrt/chat/pch.h
@@ -0,0 +1,9 @@
+//
+// pch.h
+// Header for standard system include files.
+//
+
+#pragma once
+
+#include <collection.h>
+#include "App.xaml.h"
diff --git a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj
index 888f41ebb1d..596e3cc0ed7 100644
--- a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj
+++ b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj
@@ -88,7 +88,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -103,7 +103,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -124,7 +124,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -139,7 +139,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -157,7 +157,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -171,7 +171,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -192,7 +192,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,7 +206,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -270,7 +270,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj.filters b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj.filters
index a02a1557d71..d5077b0b50d 100644
--- a/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj.filters
+++ b/cpp/demo/Ice/MFC/client/Ice.MFC.client.vcxproj.filters
@@ -61,5 +61,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj
index 16e6d08fc95..7c92d92df65 100644
--- a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj
+++ b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj
@@ -88,7 +88,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -103,7 +103,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -124,7 +124,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -139,7 +139,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -157,7 +157,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -171,7 +171,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -192,7 +192,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -206,7 +206,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -284,7 +284,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj.filters b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj.filters
index 58a778bef98..66f4cd9217e 100644
--- a/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj.filters
+++ b/cpp/demo/Ice/MFC/server/Ice.MFC.server.vcxproj.filters
@@ -73,5 +73,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/async/Ice.async.client.vcxproj b/cpp/demo/Ice/async/Ice.async.client.vcxproj
index 13cf842174e..46ad2096ef3 100644
--- a/cpp/demo/Ice/async/Ice.async.client.vcxproj
+++ b/cpp/demo/Ice/async/Ice.async.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/async/Ice.async.client.vcxproj.filters b/cpp/demo/Ice/async/Ice.async.client.vcxproj.filters
index 672b9186225..ae3f6e5df26 100644
--- a/cpp/demo/Ice/async/Ice.async.client.vcxproj.filters
+++ b/cpp/demo/Ice/async/Ice.async.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/async/Ice.async.server.vcxproj b/cpp/demo/Ice/async/Ice.async.server.vcxproj
index 62d9bdcff6c..e95e37f2998 100644
--- a/cpp/demo/Ice/async/Ice.async.server.vcxproj
+++ b/cpp/demo/Ice/async/Ice.async.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -229,7 +229,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/async/Ice.async.server.vcxproj.filters b/cpp/demo/Ice/async/Ice.async.server.vcxproj.filters
index 66cd2102e12..1541666df5c 100644
--- a/cpp/demo/Ice/async/Ice.async.server.vcxproj.filters
+++ b/cpp/demo/Ice/async/Ice.async.server.vcxproj.filters
@@ -44,5 +44,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj b/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj
index f54872e3024..215189ab006 100644
--- a/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj
+++ b/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj.filters b/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj.filters
index 5cc532f1978..43c74ddd032 100644
--- a/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj.filters
+++ b/cpp/demo/Ice/bidir/Ice.bidir.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj b/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj
index d018b40f33e..2d1a283dd98 100644
--- a/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj
+++ b/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj.filters b/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj.filters
index a46da4f1d2a..b173958cacb 100644
--- a/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj.filters
+++ b/cpp/demo/Ice/bidir/Ice.bidir.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/callback/Ice.callback.client.vcxproj b/cpp/demo/Ice/callback/Ice.callback.client.vcxproj
index 833a4810056..27913da0743 100644
--- a/cpp/demo/Ice/callback/Ice.callback.client.vcxproj
+++ b/cpp/demo/Ice/callback/Ice.callback.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/callback/Ice.callback.client.vcxproj.filters b/cpp/demo/Ice/callback/Ice.callback.client.vcxproj.filters
index c56b9d4cf93..be585315bbb 100644
--- a/cpp/demo/Ice/callback/Ice.callback.client.vcxproj.filters
+++ b/cpp/demo/Ice/callback/Ice.callback.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/callback/Ice.callback.server.vcxproj b/cpp/demo/Ice/callback/Ice.callback.server.vcxproj
index 2e32f2dc32a..b0efdcba182 100644
--- a/cpp/demo/Ice/callback/Ice.callback.server.vcxproj
+++ b/cpp/demo/Ice/callback/Ice.callback.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/callback/Ice.callback.server.vcxproj.filters b/cpp/demo/Ice/callback/Ice.callback.server.vcxproj.filters
index 22621eb419b..246150afacb 100644
--- a/cpp/demo/Ice/callback/Ice.callback.server.vcxproj.filters
+++ b/cpp/demo/Ice/callback/Ice.callback.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj
index 9eccaf17194..f6932fdd2a1 100644
--- a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj
+++ b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters
index ce19c8c7d7a..b51e9f249df 100644
--- a/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters
+++ b/cpp/demo/Ice/converter/Ice.converter.client.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
index ae4afca2ee9..88aba51ab8a 100644
--- a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
+++ b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj.filters b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj.filters
index 24e30c24744..5c42f229373 100644
--- a/cpp/demo/Ice/converter/Ice.converter.server.vcxproj.filters
+++ b/cpp/demo/Ice/converter/Ice.converter.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/hello/Ice.hello.client.vcxproj b/cpp/demo/Ice/hello/Ice.hello.client.vcxproj
index b2ad5acac35..de561eaa4d4 100644
--- a/cpp/demo/Ice/hello/Ice.hello.client.vcxproj
+++ b/cpp/demo/Ice/hello/Ice.hello.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/hello/Ice.hello.client.vcxproj.filters b/cpp/demo/Ice/hello/Ice.hello.client.vcxproj.filters
index 88a4b79d538..85afc6bbb5c 100644
--- a/cpp/demo/Ice/hello/Ice.hello.client.vcxproj.filters
+++ b/cpp/demo/Ice/hello/Ice.hello.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/hello/Ice.hello.server.vcxproj b/cpp/demo/Ice/hello/Ice.hello.server.vcxproj
index d33576f1a5f..02324f47c47 100644
--- a/cpp/demo/Ice/hello/Ice.hello.server.vcxproj
+++ b/cpp/demo/Ice/hello/Ice.hello.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -172,7 +172,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -188,7 +188,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -226,7 +226,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/hello/Ice.hello.server.vcxproj.filters b/cpp/demo/Ice/hello/Ice.hello.server.vcxproj.filters
index 6867d7636f7..2ff32778282 100644
--- a/cpp/demo/Ice/hello/Ice.hello.server.vcxproj.filters
+++ b/cpp/demo/Ice/hello/Ice.hello.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/hello/config.server b/cpp/demo/Ice/hello/config.server
index 76e318b1915..183b5691acf 100644
--- a/cpp/demo/Ice/hello/config.server
+++ b/cpp/demo/Ice/hello/config.server
@@ -44,3 +44,10 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
 IceSSL.KeyFile=s_rsa1024_priv.pem
+
+#
+# Verify the client certificate by default. Uncomment this property
+# setting if you run the demo with a client which doesn't support
+# client certificates (such as a Metro Style App client for example).
+#
+#IceSSL.VerifyPeer=0
diff --git a/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj b/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj
index 0378df8e40f..2e45ff8db11 100644
--- a/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj
+++ b/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj.filters b/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj.filters
index 23a05afde20..324132b8355 100644
--- a/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj.filters
+++ b/cpp/demo/Ice/interleaved/Ice.interleaved.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj b/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj
index 9ffc1215bb2..0e705d11912 100644
--- a/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj
+++ b/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj.filters b/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj.filters
index 5c999eb5318..da38181f1df 100644
--- a/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj.filters
+++ b/cpp/demo/Ice/interleaved/Ice.interleaved.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj b/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj
index 1b411c6a25b..ba174212ed1 100644
--- a/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj
+++ b/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj.filters b/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj.filters
index 557cc2c8a0d..ed83cc4e643 100644
--- a/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj.filters
+++ b/cpp/demo/Ice/invoke/Ice.invoke.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj b/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj
index 6875795ef76..1aca3eae7c1 100644
--- a/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj
+++ b/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj.filters b/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj.filters
index b6a2a8500ec..de2fd2bde78 100644
--- a/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj.filters
+++ b/cpp/demo/Ice/invoke/Ice.invoke.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/latency/Ice.latency.client.vcxproj b/cpp/demo/Ice/latency/Ice.latency.client.vcxproj
index 5639f60742e..d4d5af53da2 100644
--- a/cpp/demo/Ice/latency/Ice.latency.client.vcxproj
+++ b/cpp/demo/Ice/latency/Ice.latency.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/latency/Ice.latency.client.vcxproj.filters b/cpp/demo/Ice/latency/Ice.latency.client.vcxproj.filters
index 3f5f7b288cc..ece239c35e0 100644
--- a/cpp/demo/Ice/latency/Ice.latency.client.vcxproj.filters
+++ b/cpp/demo/Ice/latency/Ice.latency.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/latency/Ice.latency.server.vcxproj b/cpp/demo/Ice/latency/Ice.latency.server.vcxproj
index aed954de538..0d6606877f5 100644
--- a/cpp/demo/Ice/latency/Ice.latency.server.vcxproj
+++ b/cpp/demo/Ice/latency/Ice.latency.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -215,7 +215,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/latency/Ice.latency.server.vcxproj.filters b/cpp/demo/Ice/latency/Ice.latency.server.vcxproj.filters
index db12b64e33d..381e2df0d12 100644
--- a/cpp/demo/Ice/latency/Ice.latency.server.vcxproj.filters
+++ b/cpp/demo/Ice/latency/Ice.latency.server.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/minimal/Ice.minimal.client.vcxproj b/cpp/demo/Ice/minimal/Ice.minimal.client.vcxproj
index cc06b1409c5..421a980f1bb 100644
--- a/cpp/demo/Ice/minimal/Ice.minimal.client.vcxproj
+++ b/cpp/demo/Ice/minimal/Ice.minimal.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -220,7 +220,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/minimal/Ice.minimal.server.vcxproj b/cpp/demo/Ice/minimal/Ice.minimal.server.vcxproj
index f812cda1b7e..e21281dfa22 100644
--- a/cpp/demo/Ice/minimal/Ice.minimal.server.vcxproj
+++ b/cpp/demo/Ice/minimal/Ice.minimal.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj b/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj
index ca5a4fde62e..9711f2b1eb3 100644
--- a/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj
+++ b/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -224,7 +224,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj.filters b/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj.filters
index ba0d13e63c9..1254471f703 100644
--- a/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj.filters
+++ b/cpp/demo/Ice/multicast/Ice.multicast.client.vcxproj.filters
@@ -39,5 +39,6 @@
     </None>
     <None Include="Discovery.ice" />
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj b/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj
index 8f893ab295d..5280dea0a25 100644
--- a/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj
+++ b/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -218,7 +218,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj.filters b/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj.filters
index 8125fe800c5..a1bce1eabb3 100644
--- a/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj.filters
+++ b/cpp/demo/Ice/multicast/Ice.multicast.server.vcxproj.filters
@@ -41,5 +41,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nested/Ice.nested.client.vcxproj b/cpp/demo/Ice/nested/Ice.nested.client.vcxproj
index a8e27d01fa3..64fc95cb001 100644
--- a/cpp/demo/Ice/nested/Ice.nested.client.vcxproj
+++ b/cpp/demo/Ice/nested/Ice.nested.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nested/Ice.nested.client.vcxproj.filters b/cpp/demo/Ice/nested/Ice.nested.client.vcxproj.filters
index 2b19bd24131..d68d9c678b8 100644
--- a/cpp/demo/Ice/nested/Ice.nested.client.vcxproj.filters
+++ b/cpp/demo/Ice/nested/Ice.nested.client.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nested/Ice.nested.server.vcxproj b/cpp/demo/Ice/nested/Ice.nested.server.vcxproj
index 453eff79782..e22e6b2b8f7 100644
--- a/cpp/demo/Ice/nested/Ice.nested.server.vcxproj
+++ b/cpp/demo/Ice/nested/Ice.nested.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nested/Ice.nested.server.vcxproj.filters b/cpp/demo/Ice/nested/Ice.nested.server.vcxproj.filters
index a0c56781207..fac7a734843 100644
--- a/cpp/demo/Ice/nested/Ice.nested.server.vcxproj.filters
+++ b/cpp/demo/Ice/nested/Ice.nested.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj b/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj
index c88f6abacc7..a8d7180ec07 100644
--- a/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj.filters b/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj.filters
index 2c2d115ce0e..d94886a09c8 100644
--- a/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj.filters
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.client.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj b/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj
index 7a96b671f95..68624265a54 100644
--- a/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj.filters b/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj.filters
index e16437a3ac4..54b919c8b90 100644
--- a/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj.filters
+++ b/cpp/demo/Ice/nrvo/Ice.nrvo.server.vcxproj.filters
@@ -41,5 +41,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj
index 8267e079122..fc859d18a9b 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj.filters b/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj.filters
index 09b9aaef5ae..5a20b69bfef 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj.filters
+++ b/cpp/demo/Ice/plugin/Ice.plugin.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
index 6008ae0ae9f..799d827c430 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
@@ -87,7 +87,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloplugin34d.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloplugin34d.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -160,7 +160,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloplugin34.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -197,7 +197,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,7 +213,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloplugin34.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -242,7 +242,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
index 6fc325fbe12..907ddc7c73e 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
@@ -87,7 +87,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>loggerplugin34d.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>loggerplugin34d.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -160,7 +160,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>loggerplugin34.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -197,7 +197,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,7 +213,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>loggerplugin34.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -243,7 +243,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj
index d923c131a2a..a9714cc1985 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -216,7 +216,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj.filters b/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj.filters
index 41d4390f5d4..a1e7dac5332 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj.filters
+++ b/cpp/demo/Ice/plugin/Ice.plugin.server.vcxproj.filters
@@ -21,5 +21,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/session/Ice.session.client.vcxproj b/cpp/demo/Ice/session/Ice.session.client.vcxproj
index 23d42b4846d..e151c5eb42d 100644
--- a/cpp/demo/Ice/session/Ice.session.client.vcxproj
+++ b/cpp/demo/Ice/session/Ice.session.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/session/Ice.session.client.vcxproj.filters b/cpp/demo/Ice/session/Ice.session.client.vcxproj.filters
index 5db377a4714..2571c00fdc2 100644
--- a/cpp/demo/Ice/session/Ice.session.client.vcxproj.filters
+++ b/cpp/demo/Ice/session/Ice.session.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/session/Ice.session.server.vcxproj b/cpp/demo/Ice/session/Ice.session.server.vcxproj
index 4bad908ff2f..6538c718ec6 100644
--- a/cpp/demo/Ice/session/Ice.session.server.vcxproj
+++ b/cpp/demo/Ice/session/Ice.session.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -231,7 +231,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/session/Ice.session.server.vcxproj.filters b/cpp/demo/Ice/session/Ice.session.server.vcxproj.filters
index e2819523d92..ad952f79278 100644
--- a/cpp/demo/Ice/session/Ice.session.server.vcxproj.filters
+++ b/cpp/demo/Ice/session/Ice.session.server.vcxproj.filters
@@ -50,5 +50,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj b/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj
index a07680b5a0b..a69270bd6bf 100644
--- a/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj
+++ b/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj.filters b/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj.filters
index 6bafc79fcb9..b58248bf590 100644
--- a/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj.filters
+++ b/cpp/demo/Ice/throughput/Ice.throughput.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj b/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj
index aea428ab536..c8f82025289 100644
--- a/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj
+++ b/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>ice.lib;iceutil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>iced.lib;iceutild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj.filters b/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj.filters
index 61dac808d95..be050b53086 100644
--- a/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj.filters
+++ b/cpp/demo/Ice/throughput/Ice.throughput.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/value/Ice.value.client.vcxproj b/cpp/demo/Ice/value/Ice.value.client.vcxproj
index dadaf3a0f3d..2f8937b2c2e 100644
--- a/cpp/demo/Ice/value/Ice.value.client.vcxproj
+++ b/cpp/demo/Ice/value/Ice.value.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -235,7 +235,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/value/Ice.value.client.vcxproj.filters b/cpp/demo/Ice/value/Ice.value.client.vcxproj.filters
index 3513c386cd7..624386cce8a 100644
--- a/cpp/demo/Ice/value/Ice.value.client.vcxproj.filters
+++ b/cpp/demo/Ice/value/Ice.value.client.vcxproj.filters
@@ -44,5 +44,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/value/Ice.value.server.vcxproj b/cpp/demo/Ice/value/Ice.value.server.vcxproj
index 366d30ca9e2..4d1c06d3a89 100644
--- a/cpp/demo/Ice/value/Ice.value.server.vcxproj
+++ b/cpp/demo/Ice/value/Ice.value.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/value/Ice.value.server.vcxproj.filters b/cpp/demo/Ice/value/Ice.value.server.vcxproj.filters
index e273c3897dd..9899d1c2aad 100644
--- a/cpp/demo/Ice/value/Ice.value.server.vcxproj.filters
+++ b/cpp/demo/Ice/value/Ice.value.server.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/bidir/.gitignore b/cpp/demo/Ice/winrt/bidir/.gitignore
new file mode 100644
index 00000000000..462c718bae8
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/.gitignore
@@ -0,0 +1,5 @@
+Debug/*
+Release/*
+Callback.cpp
+Callback.h
+ipch
diff --git a/cpp/demo/Ice/winrt/bidir/App.xaml b/cpp/demo/Ice/winrt/bidir/App.xaml
new file mode 100644
index 00000000000..7f1bb6fb4af
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/App.xaml
@@ -0,0 +1,48 @@
+<Application
+    x:Class="bidir.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:bidir">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <!-- 
+                    Styles that define common aspects of the platform look and feel
+                    Required by Visual Studio project and item templates
+                 -->
+                <ResourceDictionary Source="Common/StandardStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="TitleStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+            </Style>
+            <Style x:Key="LabelStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="18" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="OutputStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="H1Style" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="36" />
+                <Setter Property="Margin" Value="0,0,0,25" />
+            </Style>
+            <Style x:Key="FooterStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="Margin" Value="0,8,0,0" />
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/cpp/demo/Ice/winrt/bidir/App.xaml.cpp b/cpp/demo/Ice/winrt/bidir/App.xaml.cpp
new file mode 100644
index 00000000000..d2b443c3643
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/App.xaml.cpp
@@ -0,0 +1,83 @@
+//
+// App.xaml.cpp
+// Implementation of the App class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace bidir;
+
+using namespace Platform;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Interop;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+	InitializeComponent();
+	Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used when the application is launched to open a specific file, to display
+/// search results, and so forth.
+/// </summary>
+/// <param name="pArgs">Details about the launch request and process.</param>
+void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs)
+{
+	// Do not repeat app initialization when already running, just ensure that
+	// the window is active
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running)
+	{
+		Window::Current->Activate();
+		return;
+	}
+
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated)
+	{
+		//TODO: Load state from previously suspended application
+	}
+
+	// Create a Frame to act navigation context and navigate to the first page
+	auto rootFrame = ref new Frame();
+	if (!rootFrame->Navigate(TypeName(MainPage::typeid)))
+	{
+		throw ref new FailureException("Failed to create initial page");
+	}
+
+	// Place the frame in the current Window and ensure that it is active
+	Window::Current->Content = rootFrame;
+	Window::Current->Activate();
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="sender">The source of the suspend request.</param>
+/// <param name="e">Details about the suspend request.</param>
+void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
+{
+	(void) sender;	// Unused parameter
+	(void) e;	// Unused parameter
+
+	//TODO: Save application state and stop any background activity
+}
diff --git a/cpp/demo/Ice/winrt/bidir/App.xaml.h b/cpp/demo/Ice/winrt/bidir/App.xaml.h
new file mode 100644
index 00000000000..7cce50550bb
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/App.xaml.h
@@ -0,0 +1,24 @@
+//
+// App.xaml.h
+// Declaration of the App class.
+//
+
+#pragma once
+
+#include "App.g.h"
+
+namespace bidir
+{
+	/// <summary>
+	/// Provides application-specific behavior to supplement the default Application class.
+	/// </summary>
+	ref class App sealed
+	{
+	public:
+		App();
+		virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override;
+
+	private:
+		void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
+	};
+}
diff --git a/cpp/demo/Ice/winrt/bidir/Assets/Logo.png b/cpp/demo/Ice/winrt/bidir/Assets/Logo.png
new file mode 100644
index 00000000000..e26771cb33a
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Assets/Logo.png
diff --git a/cpp/demo/Ice/winrt/bidir/Assets/SmallLogo.png b/cpp/demo/Ice/winrt/bidir/Assets/SmallLogo.png
new file mode 100644
index 00000000000..1eb0d9d528c
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Assets/SmallLogo.png
diff --git a/cpp/demo/Ice/winrt/bidir/Assets/SplashScreen.png b/cpp/demo/Ice/winrt/bidir/Assets/SplashScreen.png
new file mode 100644
index 00000000000..c951e031bdf
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Assets/SplashScreen.png
diff --git a/cpp/demo/Ice/winrt/bidir/Assets/StoreLogo.png b/cpp/demo/Ice/winrt/bidir/Assets/StoreLogo.png
new file mode 100644
index 00000000000..dcb672712c6
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Assets/StoreLogo.png
diff --git a/cpp/demo/Ice/winrt/bidir/Callback.ice b/cpp/demo/Ice/winrt/bidir/Callback.ice
new file mode 100644
index 00000000000..ccf863e08b1
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Callback.ice
@@ -0,0 +1,28 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
+
+#include <Ice/Identity.ice>
+
+module Demo
+{
+
+interface CallbackReceiver
+{
+    void callback(int num);
+};
+
+interface CallbackSender
+{
+    void addClient(Ice::Identity ident);
+};
+
+};
+
diff --git a/cpp/demo/Ice/winrt/bidir/Common/StandardStyles.xaml b/cpp/demo/Ice/winrt/bidir/Common/StandardStyles.xaml
new file mode 100644
index 00000000000..1937eb76021
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Common/StandardStyles.xaml
@@ -0,0 +1,1007 @@
+<!--
+    This file contains XAML styles that simplify application development.
+
+    These are not merely convenient, but are required by most Visual Studio project and item templates.
+    Removing, renaming, or otherwise modifying the content of these files may result in a project that
+    does not build, or that will not build once additional pages are added.  If variations on these
+    styles are desired it is recommended that you copy the content under a new name and modify your
+    private copy.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Non-brush values that vary across themes -->
+    
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <x:String x:Key="BackButtonGlyph">&#xE071;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0BA;</x:String>
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <x:String x:Key="BackButtonGlyph">&#xE0A6;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0C4;</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- RichTextBlock styles -->
+
+    <Style x:Key="BasicRichTextStyle" TargetType="RichTextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BasicRichTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ItemRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"/>
+
+    <Style x:Key="BodyRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <!-- TextBlock styles -->
+
+    <Style x:Key="BasicTextStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BasicTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="HeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="40"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-2" Y="8"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="26.667"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="30"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="6"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+
+    <Style x:Key="ItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"/>
+
+    <Style x:Key="BodyTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <Style x:Key="CaptionTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+    </Style>
+
+    <!-- Button styles -->
+
+    <!--
+        TextButtonStyle is used to style a Button using subheader-styled text with no other adornment.  This
+        style is used in the GroupedItemsPage as a group header and in the FileOpenPickerPage for triggering
+        commands.
+    -->
+    <Style x:Key="TextButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        TextRadioButtonStyle is used to style a RadioButton using subheader-styled text with no other adornment.
+        This style is used in the SearchResultsPage to allow selection among filters.
+    -->
+    <Style x:Key="TextRadioButtonStyle" TargetType="RadioButton">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Margin" Value="0,0,30,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked"/>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        AppBarButtonStyle is used to style a Button for use in an App Bar.  Content will be centered and should fit within
+        the 40-pixel radius glyph provided.  16-point Segoe UI Symbol is used for content text to simplify the use of glyphs
+        from that font.  AutomationProperties.Name is used for the text below the glyph.
+    -->
+    <Style x:Key="AppBarButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="AutomationProperties.ItemType" Value="App Bar Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="100" Background="Transparent">
+                        <StackPanel VerticalAlignment="Top" Margin="0,12,0,11">
+                            <Grid Width="40" Height="40" Margin="0,0,0,5" HorizontalAlignment="Center">
+                                <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0" Foreground="{StaticResource AppBarItemBackgroundThemeBrush}"/>
+                                <TextBlock x:Name="OutlineGlyph" Text="&#xE0A7;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0"/>
+                                <ContentPresenter x:Name="Content" HorizontalAlignment="Center" Margin="-1,-1,0,0" VerticalAlignment="Center"/>
+                            </Grid>
+                            <TextBlock
+                                x:Name="TextLabel"
+                                Text="{TemplateBinding AutomationProperties.Name}"
+                                Foreground="{StaticResource AppBarItemForegroundThemeBrush}"
+                                Margin="0,0,2,0"
+                                FontSize="12"
+                                TextAlignment="Center"
+                                Width="88"
+                                MaxHeight="32"
+                                TextTrimming="WordEllipsis"
+                                Style="{StaticResource BasicTextStyle}"/>
+                        </StackPanel>
+                        <Rectangle
+                                x:Name="FocusVisualWhite"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="1.5"/>
+                        <Rectangle
+                                x:Name="FocusVisualBlack"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ApplicationViewStates">
+                                <VisualState x:Name="FullScreenLandscape"/>
+                                <VisualState x:Name="Filled"/>
+                                <VisualState x:Name="FullScreenPortrait">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Snapped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualWhite"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualBlack"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Standard App Bar buttons -->
+  
+    <Style x:Key="SkipBackAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipBackAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Back"/>
+        <Setter Property="Content" Value="&#xE100;"/>
+    </Style>
+    <Style x:Key="SkipAheadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipAheadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Ahead"/>
+        <Setter Property="Content" Value="&#xE101;"/>
+    </Style>
+    <Style x:Key="PlayAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PlayAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Play"/>
+        <Setter Property="Content" Value="&#xE102;"/>
+    </Style>
+    <Style x:Key="PauseAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PauseAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pause"/>
+        <Setter Property="Content" Value="&#xE103;"/>
+    </Style>
+    <Style x:Key="EditAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="EditAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Edit"/>
+        <Setter Property="Content" Value="&#xE104;"/>
+    </Style>
+    <Style x:Key="SaveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SaveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Save"/>
+        <Setter Property="Content" Value="&#xE105;"/>
+    </Style>
+    <Style x:Key="DeleteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DeleteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Delete"/>
+        <Setter Property="Content" Value="&#xE106;"/>
+    </Style>
+    <Style x:Key="DiscardAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DiscardAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Discard"/>
+        <Setter Property="Content" Value="&#xE107;"/>
+    </Style>
+    <Style x:Key="RemoveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RemoveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Remove"/>
+        <Setter Property="Content" Value="&#xE108;"/>
+    </Style>
+    <Style x:Key="AddAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="AddAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Add"/>
+        <Setter Property="Content" Value="&#xE109;"/>
+    </Style>
+    <Style x:Key="NoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="No"/>
+        <Setter Property="Content" Value="&#xE10A;"/>
+    </Style>
+    <Style x:Key="YesAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="YesAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Yes"/>
+        <Setter Property="Content" Value="&#xE10B;"/>
+    </Style>
+    <Style x:Key="MoreAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MoreAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="More"/>
+        <Setter Property="Content" Value="&#xE10C;"/>
+    </Style>
+    <Style x:Key="RedoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RedoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Redo"/>
+        <Setter Property="Content" Value="&#xE10D;"/>
+    </Style>
+    <Style x:Key="UndoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UndoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Undo"/>
+        <Setter Property="Content" Value="&#xE10E;"/>
+    </Style>
+    <Style x:Key="HomeAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HomeAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Home"/>
+        <Setter Property="Content" Value="&#xE10F;"/>
+    </Style>
+    <Style x:Key="OutAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="OutAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Out"/>
+        <Setter Property="Content" Value="&#xE110;"/>
+    </Style>
+    <Style x:Key="NextAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NextAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Next"/>
+        <Setter Property="Content" Value="&#xE111;"/>
+    </Style>
+    <Style x:Key="PreviousAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PreviousAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Previous"/>
+        <Setter Property="Content" Value="&#xE112;"/>
+    </Style>
+    <Style x:Key="FavoriteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="FavoriteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Favorite"/>
+        <Setter Property="Content" Value="&#xE113;"/>
+    </Style>
+    <Style x:Key="PhotoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PhotoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Photo"/>
+        <Setter Property="Content" Value="&#xE114;"/>
+    </Style>
+    <Style x:Key="SettingsAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SettingsAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Settings"/>
+        <Setter Property="Content" Value="&#xE115;"/>
+    </Style>
+    <Style x:Key="VideoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="VideoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Video"/>
+        <Setter Property="Content" Value="&#xE116;"/>
+    </Style>
+    <Style x:Key="RefreshAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RefreshAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Refresh"/>
+        <Setter Property="Content" Value="&#xE117;"/>
+    </Style>
+    <Style x:Key="DownloadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DownloadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Download"/>
+        <Setter Property="Content" Value="&#xE118;"/>
+    </Style>
+    <Style x:Key="MailAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MailAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Mail"/>
+        <Setter Property="Content" Value="&#xE119;"/>
+    </Style>
+    <Style x:Key="SearchAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SearchAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Search"/>
+        <Setter Property="Content" Value="&#xE11A;"/>
+    </Style>
+    <Style x:Key="HelpAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HelpAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Help"/>
+        <Setter Property="Content" Value="&#xE11B;"/>
+    </Style>
+    <Style x:Key="UploadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UploadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Upload"/>
+        <Setter Property="Content" Value="&#xE11C;"/>
+    </Style>
+    <Style x:Key="PinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pin"/>
+        <Setter Property="Content" Value="&#xE141;"/>
+    </Style>
+    <Style x:Key="UnpinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UnpinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Unpin"/>
+        <Setter Property="Content" Value="&#xE196;"/>
+    </Style>
+
+    <!-- Title area styles -->
+
+    <Style x:Key="PageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource HeaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,30,40"/>
+    </Style>
+
+    <Style x:Key="PageSubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource SubheaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,0,40"/>
+    </Style>
+
+    <Style x:Key="SnappedPageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource PageSubheaderTextStyle}">
+        <Setter Property="Margin" Value="0,0,18,40"/>
+    </Style>
+
+    <!--
+        BackButtonStyle is used to style a Button for use in the title area of a page.  Margins appropriate for
+        the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="BackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Width" Value="48"/>
+        <Setter Property="Height" Value="48"/>
+        <Setter Property="Margin" Value="36,0,36,36"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid">
+                        <Grid Margin="-1,-16,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0A6;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        PortraitBackButtonStyle is used to style a Button for use in the title area of a portrait page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="PortraitBackButtonStyle" TargetType="Button" BasedOn="{StaticResource BackButtonStyle}">
+        <Setter Property="Margin" Value="26,0,26,36"/>
+    </Style>
+
+    <!--
+        SnappedBackButtonStyle is used to style a Button for use in the title area of a snapped page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+        
+        The obvious duplication here is necessary as the glyphs used in snapped are not merely smaller versions of the same
+        glyph but are actually distinct.
+    -->
+    <Style x:Key="SnappedBackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Margin" Value="20,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="26.66667"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="36" Height="36" Margin="-3,0,7,33">
+                        <Grid Margin="-1,-1,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0D4;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonSnappedGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0C4;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Item templates -->
+
+    <!-- Grid-appropriate 250 pixel square item template as seen in the GroupedItemsPage and ItemsPage -->
+    <DataTemplate x:Key="Standard250x250ItemTemplate">
+        <Grid HorizontalAlignment="Left" Width="250" Height="250">
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel VerticalAlignment="Bottom" Background="{StaticResource ListViewItemOverlayBackgroundThemeBrush}">
+                <TextBlock Text="{Binding Title}" Foreground="{StaticResource ListViewItemOverlayForegroundThemeBrush}" Style="{StaticResource TitleTextStyle}" Height="60" Margin="15,0,15,0"/>
+                <TextBlock Text="{Binding Subtitle}" Foreground="{StaticResource ListViewItemOverlaySecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap" Margin="15,0,15,10"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 500 by 130 pixel item template as seen in the GroupDetailPage -->
+    <DataTemplate x:Key="Standard500x130ItemTemplate">
+        <Grid Height="110" Width="480" Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 130 pixel high item template as seen in the SplitPage -->
+    <DataTemplate x:Key="Standard130ItemTemplate">
+        <Grid Height="110" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!--
+        List-appropriate 80 pixel high item template as seen in the SplitPage when Filled, and
+        the following pages when snapped: GroupedItemsPage, GroupDetailPage, and ItemsPage
+    -->
+    <DataTemplate x:Key="Standard80ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="60" Height="60">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource ItemTextStyle}" MaxHeight="40"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 300 by 70 pixel item template as seen in the SearchResultsPage -->
+    <DataTemplate x:Key="StandardSmallIcon300x70ItemTemplate">
+        <Grid Width="294" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 70 pixel high item template as seen in the SearchResultsPage when Snapped -->
+    <DataTemplate x:Key="StandardSmallIcon70ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+  <!--
+      190x130 pixel item template for displaying file previews as seen in the FileOpenPickerPage
+      Includes an elaborate tooltip to display title and description text
+  -->
+  <DataTemplate x:Key="StandardFileWithTooltip190x130ItemTemplate">
+        <Grid>
+            <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image
+                    Source="{Binding Image}"
+                    Width="190"
+                    Height="130"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Stretch="Uniform"/>
+            </Grid>
+            <ToolTipService.Placement>Mouse</ToolTipService.Placement>
+            <ToolTipService.ToolTip>
+                <ToolTip>
+                    <ToolTip.Style>
+                        <Style TargetType="ToolTip">
+                            <Setter Property="BorderBrush" Value="{StaticResource ToolTipBackgroundThemeBrush}" />
+                            <Setter Property="Padding" Value="0" />
+                        </Style>
+                    </ToolTip.Style>
+
+                    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="20">
+                            <Image
+                                Source="{Binding Image}"
+                                Width="160"
+                                Height="160"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Stretch="Uniform"/>
+                        </Grid>
+                        <StackPanel Width="200" Grid.Column="1" Margin="0,20,20,20">
+                            <TextBlock Text="{Binding Title}" TextWrapping="NoWrap" Style="{StaticResource BodyTextStyle}"/>
+                            <TextBlock Text="{Binding Description}" MaxHeight="140" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource BodyTextStyle}"/>
+                        </StackPanel>
+                    </Grid>   
+                </ToolTip>                
+            </ToolTipService.ToolTip>
+        </Grid>
+    </DataTemplate>
+
+    <!-- ScrollViewer styles -->
+
+    <Style x:Key="HorizontalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <Style x:Key="VerticalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <!-- Page layout roots typically use entrance animations and a theme-appropriate background color -->
+
+    <Style x:Key="LayoutRootStyle" TargetType="Panel">
+        <Setter Property="Background" Value="{StaticResource ApplicationPageBackgroundThemeBrush}"/>
+        <Setter Property="ChildrenTransitions">
+            <Setter.Value>
+                <TransitionCollection>
+                    <EntranceThemeTransition/>
+                </TransitionCollection>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/cpp/demo/Ice/winrt/bidir/MainPage.xaml b/cpp/demo/Ice/winrt/bidir/MainPage.xaml
new file mode 100644
index 00000000000..fa82d77cc7a
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/MainPage.xaml
@@ -0,0 +1,67 @@
+<Page
+    x:Class="bidir.MainPage"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:bidir"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <!-- Header -->
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="ZeroC - Ice Bidir Demo" Style="{StaticResource TitleStyle}"
+                       Margin="5, 5, 5, 5"
+                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
+        </StackPanel>
+        <!-- Content -->
+        <Border Grid.Row="1" Padding="20">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="auto"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="9*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource LabelStyle}">Hostname:</TextBlock>
+                    <TextBox Grid.Column="1" x:Name="hostname" Text="127.0.0.1"/>
+                </Grid>
+                <TextBlock Grid.Row="1" Style="{StaticResource LabelStyle}" Padding="5, 5, 5, 5" Text="Client Output"
+                        Margin="0, 5, 0, 0"/>
+                <Border Grid.Row="2" BorderThickness="2" BorderBrush="Gray" Background="Gray"
+                        Margin="0, 5, 0, 0">
+                    <ScrollViewer x:Name="scroller"  VerticalScrollBarVisibility="Auto" 
+                                  HorizontalScrollBarVisibility="Disabled" Width="Auto" Height="Auto" ZoomMode="Disabled">
+                        <TextBlock x:Name="output" Style="{StaticResource OutputStyle}" Padding="5, 5, 5, 5"/>
+                    </ScrollViewer>
+                </Border>
+                <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0, 5, 0, 0">
+                    <Button x:Name="startClient" Content="Start Client" Click="startClient_Click"/>
+                    <Button x:Name="stopClient" Content="Stop Client" IsEnabled="False" Click="stopClient_Click"/>
+                </StackPanel>
+            </Grid>
+        </Border>
+        <!-- Footer -->
+        <StackPanel Grid.Row="2" VerticalAlignment="Bottom">
+            <TextBlock Margin="5, 5, 5, 5"  Style="{StaticResource FooterStyle}" 
+                       Text="© 2012 ZeroC. All rights reserved."/>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp
new file mode 100644
index 00000000000..11f76249417
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.cpp
@@ -0,0 +1,130 @@
+//
+// MainPage.xaml.cpp
+// Implementation of the MainPage class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace bidir;
+
+using namespace std;
+using namespace Demo;
+using namespace Ice;
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+void
+CallbackReceiverI::callback(Ice::Int num, const Ice::Current& current)
+{
+    _page->callback(num, current);
+}
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+MainPage::MainPage()
+{
+    InitializeComponent();
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void MainPage::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    (void) e;	// Unused parameter
+}
+
+void bidir::MainPage::startClient_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties();
+        initData.properties->setProperty("Ice.Warn.Connections", "1");
+        initData.properties->setProperty("Ice.ACM.Client", "0");
+
+        _communicator = Ice::initialize(initData);
+
+        CallbackSenderPrx server = CallbackSenderPrx::checkedCast(
+            _communicator->stringToProxy("sender:tcp -h " + IceUtil::wstringToString(hostname->Text->Data()) + " -p 10000"));
+
+        if(!server)
+        {
+            print("invalid proxy\n");
+            return;
+        }
+        startClient->IsEnabled = false;
+        stopClient->IsEnabled = true;
+        Ice::ObjectAdapterPtr adapter = _communicator->createObjectAdapter("");
+        Ice::Identity ident;
+        ident.name = IceUtil::generateUUID();
+        ident.category = "";
+        CallbackReceiverPtr cr = new CallbackReceiverI(this);
+        adapter->add(cr, ident);
+        adapter->activate();
+        server->ice_getConnection()->setAdapter(adapter);
+        server->addClient(ident);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << ex << endl;
+        print(os.str());
+        startClient->IsEnabled = true;
+        stopClient->IsEnabled = false;
+    }
+}
+
+
+void bidir::MainPage::stopClient_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    try
+    {
+        if(_communicator)
+        {
+            _communicator->destroy();
+            _communicator = 0;
+        }
+        startClient->IsEnabled = true;
+        stopClient->IsEnabled = false;
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << ex << endl;
+        print(os.str());
+        startClient->IsEnabled = true;
+        stopClient->IsEnabled = false;
+    }
+}
+
+void
+bidir::MainPage::callback(Ice::Int num, const Ice::Current&)
+{
+    ostringstream os;
+    os << "received callback #" << num << endl;
+    print(os.str());
+}
+
+void 
+bidir::MainPage::print(const std::string& message)
+{
+    this->Dispatcher->RunAsync(CoreDispatcherPriority::Normal, ref new DispatchedHandler([=] ()
+        {
+            output->Text += ref new String(IceUtil::stringToWstring(message).c_str());
+            output->UpdateLayout();
+            scroller->ScrollToVerticalOffset(scroller->ScrollableHeight);
+        }, CallbackContext::Any));
+}
diff --git a/cpp/demo/Ice/winrt/bidir/MainPage.xaml.h b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.h
new file mode 100644
index 00000000000..cec23cb50d5
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/MainPage.xaml.h
@@ -0,0 +1,55 @@
+//
+// MainPage.xaml.h
+// Declaration of the MainPage class.
+//
+
+#pragma once
+
+#include "MainPage.g.h"
+#include <IceUtil/IceUtil.h>
+#include <Ice/Ice.h>
+#include <Callback.h>
+
+namespace bidir
+{
+    ref class MainPage;
+
+    class CallbackReceiverI : public Demo::CallbackReceiver
+    {
+    public:
+
+        CallbackReceiverI(MainPage^ page) : _page(page)
+        {
+        }
+
+        virtual void
+        callback(Ice::Int, const Ice::Current&);
+    
+    private:
+        
+        MainPage^ _page;
+    };
+
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public ref class MainPage sealed
+    {
+    public:
+        MainPage();
+
+    protected:
+
+        virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+
+    private:
+
+        friend class CallbackReceiverI;
+
+        void callback(Ice::Int, const Ice::Current&);
+        void print(const std::string&);
+        void startClient_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+        void stopClient_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+        Ice::CommunicatorPtr _communicator;
+    };
+}
diff --git a/cpp/demo/Ice/winrt/bidir/Package.appxmanifest b/cpp/demo/Ice/winrt/bidir/Package.appxmanifest
new file mode 100644
index 00000000000..da1f0209f15
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/Package.appxmanifest
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+  <Identity Name="274700d0-21de-4e74-9f39-2e702de8c432" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>Ice Bidir Demo</DisplayName>
+    <PublisherDisplayName>ZeroC</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.2.0</OSMinVersion>
+    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="bidir.App">
+      <VisualElements DisplayName="Ice Bidir Demo" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="bidir" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="internetClientServer" />
+    <Capability Name="internetClient" />
+  </Capabilities>
+</Package>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/bidir/README.txt b/cpp/demo/Ice/winrt/bidir/README.txt
new file mode 100644
index 00000000000..dbd797d122e
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/README.txt
@@ -0,0 +1,14 @@
+This demo shows how to use bidirectional connections for callbacks.
+This is typically used if the server cannot open a connection to the
+client to send callbacks, for example, because firewalls block
+incoming connections to the client.
+
+First follow the instructions in the C++ Ice bidir demo README 
+to start the server.
+
+To start the client first build the demo using "Build bidir" command
+in "Build" menu.
+
+Deploy the demo using "Deploy bidir" command in "Build" menu.
+
+Then start the "Ice Bidir Demo" application from Windows Start menu.
diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj
new file mode 100644
index 00000000000..275b3cabf19
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4ef04ddd-1b81-4dc7-adf2-290e22008616}</ProjectGuid>
+    <RootNamespace>bidir</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PackageCertificateKeyFile>key.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>22710365E93A16EA1983847965CFC340086BE8B1</PackageCertificateThumbprint>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Callback.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="MainPage.xaml.h">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Common\StandardStyles.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="bidir_TemporaryKey.pfx" />
+    <None Include="Callback.ice" />
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\Logo.png" />
+    <Image Include="Assets\SmallLogo.png" />
+    <Image Include="Assets\StoreLogo.png" />
+    <Image Include="Assets\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="Callback.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="IceWinRT, Version=3.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_ProjectVersion="1" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/bidir/bidir.vcxproj.filters b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj.filters
new file mode 100644
index 00000000000..c29516d99ae
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/bidir.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>4ef04ddd-1b81-4dc7-adf2-290e22008616</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets">
+      <UniqueIdentifier>51dcd63d-9ac1-4f7a-ae17-45da43b621d7</UniqueIdentifier>
+    </Filter>
+    <Page Include="Common\StandardStyles.xaml">
+      <Filter>Common</Filter>
+    </Page>
+    <Image Include="Assets\Logo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SmallLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SplashScreen.png">
+      <Filter>Assets</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp" />
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="Callback.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h" />
+    <ClInclude Include="MainPage.xaml.h" />
+    <ClInclude Include="Callback.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="bidir_TemporaryKey.pfx" />
+    <None Include="Callback.ice" />
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/bidir/pch.cpp b/cpp/demo/Ice/winrt/bidir/pch.cpp
new file mode 100644
index 00000000000..f3963b9b14c
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/pch.cpp
@@ -0,0 +1,6 @@
+//
+// pch.cpp
+// Include the standard header and generate the precompiled header.
+//
+
+#include "pch.h"
diff --git a/cpp/demo/Ice/winrt/bidir/pch.h b/cpp/demo/Ice/winrt/bidir/pch.h
new file mode 100644
index 00000000000..77252482cf2
--- /dev/null
+++ b/cpp/demo/Ice/winrt/bidir/pch.h
@@ -0,0 +1,9 @@
+//
+// pch.h
+// Header for standard system include files.
+//
+
+#pragma once
+
+#include <collection.h>
+#include "App.xaml.h"
diff --git a/cpp/demo/Ice/winrt/hello/.gitignore b/cpp/demo/Ice/winrt/hello/.gitignore
new file mode 100644
index 00000000000..84cce1f11ea
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/.gitignore
@@ -0,0 +1,5 @@
+Debug/*
+Release/*
+Hello.cpp
+Hello.h
+ipch
diff --git a/cpp/demo/Ice/winrt/hello/App.xaml b/cpp/demo/Ice/winrt/hello/App.xaml
new file mode 100644
index 00000000000..ec193c91f8b
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/App.xaml
@@ -0,0 +1,48 @@
+<Application
+    x:Class="hello.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:hello">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <!-- 
+                    Styles that define common aspects of the platform look and feel
+                    Required by Visual Studio project and item templates
+                 -->
+                <ResourceDictionary Source="Common/StandardStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="TitleStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+            </Style>
+            <Style x:Key="LabelStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="18" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="OutputStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+                <Setter Property="Padding" Value="5, 5, 5, 5"/>
+            </Style>
+            <Style x:Key="H1Style" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="36" />
+                <Setter Property="Margin" Value="0,0,0,25" />
+            </Style>
+            <Style x:Key="FooterStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="Margin" Value="0,8,0,0" />
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/cpp/demo/Ice/winrt/hello/App.xaml.cpp b/cpp/demo/Ice/winrt/hello/App.xaml.cpp
new file mode 100644
index 00000000000..e23a2601ed3
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/App.xaml.cpp
@@ -0,0 +1,83 @@
+//
+// App.xaml.cpp
+// Implementation of the App class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace hello;
+
+using namespace Platform;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Interop;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+	InitializeComponent();
+	Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used when the application is launched to open a specific file, to display
+/// search results, and so forth.
+/// </summary>
+/// <param name="pArgs">Details about the launch request and process.</param>
+void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs)
+{
+	// Do not repeat app initialization when already running, just ensure that
+	// the window is active
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running)
+	{
+		Window::Current->Activate();
+		return;
+	}
+
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated)
+	{
+		//TODO: Load state from previously suspended application
+	}
+
+	// Create a Frame to act navigation context and navigate to the first page
+	auto rootFrame = ref new Frame();
+	if (!rootFrame->Navigate(TypeName(MainPage::typeid)))
+	{
+		throw ref new FailureException("Failed to create initial page");
+	}
+
+	// Place the frame in the current Window and ensure that it is active
+	Window::Current->Content = rootFrame;
+	Window::Current->Activate();
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="sender">The source of the suspend request.</param>
+/// <param name="e">Details about the suspend request.</param>
+void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
+{
+	(void) sender;	// Unused parameter
+	(void) e;	// Unused parameter
+
+	//TODO: Save application state and stop any background activity
+}
diff --git a/cpp/demo/Ice/winrt/hello/App.xaml.h b/cpp/demo/Ice/winrt/hello/App.xaml.h
new file mode 100644
index 00000000000..51301b382f9
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/App.xaml.h
@@ -0,0 +1,24 @@
+//
+// App.xaml.h
+// Declaration of the App class.
+//
+
+#pragma once
+
+#include "App.g.h"
+
+namespace hello
+{
+	/// <summary>
+	/// Provides application-specific behavior to supplement the default Application class.
+	/// </summary>
+	ref class App sealed
+	{
+	public:
+		App();
+		virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override;
+
+	private:
+		void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
+	};
+}
diff --git a/cpp/demo/Ice/winrt/hello/Assets/Logo.png b/cpp/demo/Ice/winrt/hello/Assets/Logo.png
new file mode 100644
index 00000000000..e26771cb33a
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Assets/Logo.png
diff --git a/cpp/demo/Ice/winrt/hello/Assets/SmallLogo.png b/cpp/demo/Ice/winrt/hello/Assets/SmallLogo.png
new file mode 100644
index 00000000000..1eb0d9d528c
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Assets/SmallLogo.png
diff --git a/cpp/demo/Ice/winrt/hello/Assets/SplashScreen.png b/cpp/demo/Ice/winrt/hello/Assets/SplashScreen.png
new file mode 100644
index 00000000000..c951e031bdf
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Assets/SplashScreen.png
diff --git a/cpp/demo/Ice/winrt/hello/Assets/StoreLogo.png b/cpp/demo/Ice/winrt/hello/Assets/StoreLogo.png
new file mode 100644
index 00000000000..dcb672712c6
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Assets/StoreLogo.png
diff --git a/cpp/demo/Ice/winrt/hello/Common/StandardStyles.xaml b/cpp/demo/Ice/winrt/hello/Common/StandardStyles.xaml
new file mode 100644
index 00000000000..1937eb76021
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Common/StandardStyles.xaml
@@ -0,0 +1,1007 @@
+<!--
+    This file contains XAML styles that simplify application development.
+
+    These are not merely convenient, but are required by most Visual Studio project and item templates.
+    Removing, renaming, or otherwise modifying the content of these files may result in a project that
+    does not build, or that will not build once additional pages are added.  If variations on these
+    styles are desired it is recommended that you copy the content under a new name and modify your
+    private copy.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Non-brush values that vary across themes -->
+    
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <x:String x:Key="BackButtonGlyph">&#xE071;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0BA;</x:String>
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <x:String x:Key="BackButtonGlyph">&#xE0A6;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0C4;</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- RichTextBlock styles -->
+
+    <Style x:Key="BasicRichTextStyle" TargetType="RichTextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BasicRichTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ItemRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"/>
+
+    <Style x:Key="BodyRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <!-- TextBlock styles -->
+
+    <Style x:Key="BasicTextStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BasicTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="HeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="40"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-2" Y="8"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="26.667"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="30"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="6"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+
+    <Style x:Key="ItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"/>
+
+    <Style x:Key="BodyTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <Style x:Key="CaptionTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+    </Style>
+
+    <!-- Button styles -->
+
+    <!--
+        TextButtonStyle is used to style a Button using subheader-styled text with no other adornment.  This
+        style is used in the GroupedItemsPage as a group header and in the FileOpenPickerPage for triggering
+        commands.
+    -->
+    <Style x:Key="TextButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        TextRadioButtonStyle is used to style a RadioButton using subheader-styled text with no other adornment.
+        This style is used in the SearchResultsPage to allow selection among filters.
+    -->
+    <Style x:Key="TextRadioButtonStyle" TargetType="RadioButton">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Margin" Value="0,0,30,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked"/>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        AppBarButtonStyle is used to style a Button for use in an App Bar.  Content will be centered and should fit within
+        the 40-pixel radius glyph provided.  16-point Segoe UI Symbol is used for content text to simplify the use of glyphs
+        from that font.  AutomationProperties.Name is used for the text below the glyph.
+    -->
+    <Style x:Key="AppBarButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="AutomationProperties.ItemType" Value="App Bar Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="100" Background="Transparent">
+                        <StackPanel VerticalAlignment="Top" Margin="0,12,0,11">
+                            <Grid Width="40" Height="40" Margin="0,0,0,5" HorizontalAlignment="Center">
+                                <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0" Foreground="{StaticResource AppBarItemBackgroundThemeBrush}"/>
+                                <TextBlock x:Name="OutlineGlyph" Text="&#xE0A7;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0"/>
+                                <ContentPresenter x:Name="Content" HorizontalAlignment="Center" Margin="-1,-1,0,0" VerticalAlignment="Center"/>
+                            </Grid>
+                            <TextBlock
+                                x:Name="TextLabel"
+                                Text="{TemplateBinding AutomationProperties.Name}"
+                                Foreground="{StaticResource AppBarItemForegroundThemeBrush}"
+                                Margin="0,0,2,0"
+                                FontSize="12"
+                                TextAlignment="Center"
+                                Width="88"
+                                MaxHeight="32"
+                                TextTrimming="WordEllipsis"
+                                Style="{StaticResource BasicTextStyle}"/>
+                        </StackPanel>
+                        <Rectangle
+                                x:Name="FocusVisualWhite"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="1.5"/>
+                        <Rectangle
+                                x:Name="FocusVisualBlack"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ApplicationViewStates">
+                                <VisualState x:Name="FullScreenLandscape"/>
+                                <VisualState x:Name="Filled"/>
+                                <VisualState x:Name="FullScreenPortrait">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Snapped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualWhite"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualBlack"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Standard App Bar buttons -->
+  
+    <Style x:Key="SkipBackAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipBackAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Back"/>
+        <Setter Property="Content" Value="&#xE100;"/>
+    </Style>
+    <Style x:Key="SkipAheadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipAheadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Ahead"/>
+        <Setter Property="Content" Value="&#xE101;"/>
+    </Style>
+    <Style x:Key="PlayAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PlayAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Play"/>
+        <Setter Property="Content" Value="&#xE102;"/>
+    </Style>
+    <Style x:Key="PauseAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PauseAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pause"/>
+        <Setter Property="Content" Value="&#xE103;"/>
+    </Style>
+    <Style x:Key="EditAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="EditAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Edit"/>
+        <Setter Property="Content" Value="&#xE104;"/>
+    </Style>
+    <Style x:Key="SaveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SaveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Save"/>
+        <Setter Property="Content" Value="&#xE105;"/>
+    </Style>
+    <Style x:Key="DeleteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DeleteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Delete"/>
+        <Setter Property="Content" Value="&#xE106;"/>
+    </Style>
+    <Style x:Key="DiscardAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DiscardAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Discard"/>
+        <Setter Property="Content" Value="&#xE107;"/>
+    </Style>
+    <Style x:Key="RemoveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RemoveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Remove"/>
+        <Setter Property="Content" Value="&#xE108;"/>
+    </Style>
+    <Style x:Key="AddAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="AddAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Add"/>
+        <Setter Property="Content" Value="&#xE109;"/>
+    </Style>
+    <Style x:Key="NoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="No"/>
+        <Setter Property="Content" Value="&#xE10A;"/>
+    </Style>
+    <Style x:Key="YesAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="YesAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Yes"/>
+        <Setter Property="Content" Value="&#xE10B;"/>
+    </Style>
+    <Style x:Key="MoreAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MoreAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="More"/>
+        <Setter Property="Content" Value="&#xE10C;"/>
+    </Style>
+    <Style x:Key="RedoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RedoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Redo"/>
+        <Setter Property="Content" Value="&#xE10D;"/>
+    </Style>
+    <Style x:Key="UndoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UndoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Undo"/>
+        <Setter Property="Content" Value="&#xE10E;"/>
+    </Style>
+    <Style x:Key="HomeAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HomeAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Home"/>
+        <Setter Property="Content" Value="&#xE10F;"/>
+    </Style>
+    <Style x:Key="OutAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="OutAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Out"/>
+        <Setter Property="Content" Value="&#xE110;"/>
+    </Style>
+    <Style x:Key="NextAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NextAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Next"/>
+        <Setter Property="Content" Value="&#xE111;"/>
+    </Style>
+    <Style x:Key="PreviousAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PreviousAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Previous"/>
+        <Setter Property="Content" Value="&#xE112;"/>
+    </Style>
+    <Style x:Key="FavoriteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="FavoriteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Favorite"/>
+        <Setter Property="Content" Value="&#xE113;"/>
+    </Style>
+    <Style x:Key="PhotoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PhotoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Photo"/>
+        <Setter Property="Content" Value="&#xE114;"/>
+    </Style>
+    <Style x:Key="SettingsAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SettingsAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Settings"/>
+        <Setter Property="Content" Value="&#xE115;"/>
+    </Style>
+    <Style x:Key="VideoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="VideoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Video"/>
+        <Setter Property="Content" Value="&#xE116;"/>
+    </Style>
+    <Style x:Key="RefreshAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RefreshAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Refresh"/>
+        <Setter Property="Content" Value="&#xE117;"/>
+    </Style>
+    <Style x:Key="DownloadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DownloadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Download"/>
+        <Setter Property="Content" Value="&#xE118;"/>
+    </Style>
+    <Style x:Key="MailAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MailAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Mail"/>
+        <Setter Property="Content" Value="&#xE119;"/>
+    </Style>
+    <Style x:Key="SearchAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SearchAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Search"/>
+        <Setter Property="Content" Value="&#xE11A;"/>
+    </Style>
+    <Style x:Key="HelpAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HelpAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Help"/>
+        <Setter Property="Content" Value="&#xE11B;"/>
+    </Style>
+    <Style x:Key="UploadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UploadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Upload"/>
+        <Setter Property="Content" Value="&#xE11C;"/>
+    </Style>
+    <Style x:Key="PinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pin"/>
+        <Setter Property="Content" Value="&#xE141;"/>
+    </Style>
+    <Style x:Key="UnpinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UnpinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Unpin"/>
+        <Setter Property="Content" Value="&#xE196;"/>
+    </Style>
+
+    <!-- Title area styles -->
+
+    <Style x:Key="PageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource HeaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,30,40"/>
+    </Style>
+
+    <Style x:Key="PageSubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource SubheaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,0,40"/>
+    </Style>
+
+    <Style x:Key="SnappedPageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource PageSubheaderTextStyle}">
+        <Setter Property="Margin" Value="0,0,18,40"/>
+    </Style>
+
+    <!--
+        BackButtonStyle is used to style a Button for use in the title area of a page.  Margins appropriate for
+        the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="BackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Width" Value="48"/>
+        <Setter Property="Height" Value="48"/>
+        <Setter Property="Margin" Value="36,0,36,36"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid">
+                        <Grid Margin="-1,-16,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0A6;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        PortraitBackButtonStyle is used to style a Button for use in the title area of a portrait page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="PortraitBackButtonStyle" TargetType="Button" BasedOn="{StaticResource BackButtonStyle}">
+        <Setter Property="Margin" Value="26,0,26,36"/>
+    </Style>
+
+    <!--
+        SnappedBackButtonStyle is used to style a Button for use in the title area of a snapped page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+        
+        The obvious duplication here is necessary as the glyphs used in snapped are not merely smaller versions of the same
+        glyph but are actually distinct.
+    -->
+    <Style x:Key="SnappedBackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Margin" Value="20,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="26.66667"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="36" Height="36" Margin="-3,0,7,33">
+                        <Grid Margin="-1,-1,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0D4;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonSnappedGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0C4;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Item templates -->
+
+    <!-- Grid-appropriate 250 pixel square item template as seen in the GroupedItemsPage and ItemsPage -->
+    <DataTemplate x:Key="Standard250x250ItemTemplate">
+        <Grid HorizontalAlignment="Left" Width="250" Height="250">
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel VerticalAlignment="Bottom" Background="{StaticResource ListViewItemOverlayBackgroundThemeBrush}">
+                <TextBlock Text="{Binding Title}" Foreground="{StaticResource ListViewItemOverlayForegroundThemeBrush}" Style="{StaticResource TitleTextStyle}" Height="60" Margin="15,0,15,0"/>
+                <TextBlock Text="{Binding Subtitle}" Foreground="{StaticResource ListViewItemOverlaySecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap" Margin="15,0,15,10"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 500 by 130 pixel item template as seen in the GroupDetailPage -->
+    <DataTemplate x:Key="Standard500x130ItemTemplate">
+        <Grid Height="110" Width="480" Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 130 pixel high item template as seen in the SplitPage -->
+    <DataTemplate x:Key="Standard130ItemTemplate">
+        <Grid Height="110" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!--
+        List-appropriate 80 pixel high item template as seen in the SplitPage when Filled, and
+        the following pages when snapped: GroupedItemsPage, GroupDetailPage, and ItemsPage
+    -->
+    <DataTemplate x:Key="Standard80ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="60" Height="60">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource ItemTextStyle}" MaxHeight="40"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 300 by 70 pixel item template as seen in the SearchResultsPage -->
+    <DataTemplate x:Key="StandardSmallIcon300x70ItemTemplate">
+        <Grid Width="294" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 70 pixel high item template as seen in the SearchResultsPage when Snapped -->
+    <DataTemplate x:Key="StandardSmallIcon70ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+  <!--
+      190x130 pixel item template for displaying file previews as seen in the FileOpenPickerPage
+      Includes an elaborate tooltip to display title and description text
+  -->
+  <DataTemplate x:Key="StandardFileWithTooltip190x130ItemTemplate">
+        <Grid>
+            <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image
+                    Source="{Binding Image}"
+                    Width="190"
+                    Height="130"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Stretch="Uniform"/>
+            </Grid>
+            <ToolTipService.Placement>Mouse</ToolTipService.Placement>
+            <ToolTipService.ToolTip>
+                <ToolTip>
+                    <ToolTip.Style>
+                        <Style TargetType="ToolTip">
+                            <Setter Property="BorderBrush" Value="{StaticResource ToolTipBackgroundThemeBrush}" />
+                            <Setter Property="Padding" Value="0" />
+                        </Style>
+                    </ToolTip.Style>
+
+                    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="20">
+                            <Image
+                                Source="{Binding Image}"
+                                Width="160"
+                                Height="160"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Stretch="Uniform"/>
+                        </Grid>
+                        <StackPanel Width="200" Grid.Column="1" Margin="0,20,20,20">
+                            <TextBlock Text="{Binding Title}" TextWrapping="NoWrap" Style="{StaticResource BodyTextStyle}"/>
+                            <TextBlock Text="{Binding Description}" MaxHeight="140" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource BodyTextStyle}"/>
+                        </StackPanel>
+                    </Grid>   
+                </ToolTip>                
+            </ToolTipService.ToolTip>
+        </Grid>
+    </DataTemplate>
+
+    <!-- ScrollViewer styles -->
+
+    <Style x:Key="HorizontalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <Style x:Key="VerticalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <!-- Page layout roots typically use entrance animations and a theme-appropriate background color -->
+
+    <Style x:Key="LayoutRootStyle" TargetType="Panel">
+        <Setter Property="Background" Value="{StaticResource ApplicationPageBackgroundThemeBrush}"/>
+        <Setter Property="ChildrenTransitions">
+            <Setter.Value>
+                <TransitionCollection>
+                    <EntranceThemeTransition/>
+                </TransitionCollection>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/cpp/demo/Ice/winrt/hello/Hello.ice b/cpp/demo/Ice/winrt/hello/Hello.ice
new file mode 100644
index 00000000000..baf3617d3b0
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Hello.ice
@@ -0,0 +1,22 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
+
+module Demo
+{
+
+interface Hello
+{
+    idempotent void sayHello(int delay);
+    void shutdown();
+};
+
+};
+
diff --git a/cpp/demo/Ice/winrt/hello/MainPage.xaml b/cpp/demo/Ice/winrt/hello/MainPage.xaml
new file mode 100644
index 00000000000..23d2759a514
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/MainPage.xaml
@@ -0,0 +1,130 @@
+<Page
+    x:Class="hello.MainPage"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:hello"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <!-- Header -->
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="ZeroC - Ice Hello Demo" Style="{StaticResource TitleStyle}"
+                       Margin="5, 5, 5, 5"
+                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
+        </StackPanel>
+        <!-- Content -->
+        <Border Grid.Row="1" Padding="20">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <Grid Grid.Row="0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="9*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource LabelStyle}">Hostname:</TextBlock>
+                    <TextBox Grid.Column="1" x:Name="hostname" Text="127.0.0.1"/>
+                </Grid>
+                <Grid Grid.Row="1" Margin="0, 5, 0, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="9*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource LabelStyle}">Mode:</TextBlock>
+                    <ComboBox Grid.Column="1" Name="mode" Padding="5, 5, 5, 5">
+                        <ComboBoxItem>
+                            <x:String>Twoway</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Twoway Secure</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Oneway</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Oneway Batch</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Oneway Secure</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Oneway Batch Secure</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Datagram</x:String>
+                        </ComboBoxItem>
+                        <ComboBoxItem>
+                            <x:String>Datagram Batch</x:String>
+                        </ComboBoxItem>
+                    </ComboBox>
+                </Grid>
+                <Grid Grid.Row="2" Margin="0, 5, 0, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="9*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource LabelStyle}">Timeout:</TextBlock>
+                    <Slider Grid.Column="1" Name="timeout" Maximum="5" Minimum="0" Orientation="Horizontal" StepFrequency="0.1"/>
+                </Grid>
+                <Grid Grid.Row="3" Margin="0, 5, 0, 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="9*"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Style="{StaticResource LabelStyle}">Delay:</TextBlock>
+                    <Slider Grid.Column="1" Name="delay" Maximum="5" Minimum="0" Orientation="Horizontal" StepFrequency="0.1"/>
+                </Grid>
+                <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="0, 5, 0, 0">
+                    <Button x:Name="hello" Content="Hello World!" Click="hello_Click"/>
+                    <Button x:Name="shutdown" Content="Shutdown" Click="shutdown_Click"/>
+                    <Button x:Name="flush" Content="Flush" Click="flush_Click" IsEnabled="False"/>
+                </StackPanel>
+                <TextBlock Grid.Row="5" Style="{StaticResource LabelStyle}" Padding="5, 5, 5, 5" Text="Client Output"
+                           Margin="0, 5, 0, 0"/>
+                <Border Grid.Row="6" BorderThickness="2" BorderBrush="Gray" Background="Gray"
+                        Margin="0, 5, 0, 0">
+                    <ScrollViewer VerticalScrollBarVisibility="Auto" 
+                        HorizontalScrollBarVisibility="Disabled" 
+                        Width="Auto" Height="Auto"
+                        ZoomMode="Disabled">
+                        <TextBlock x:Name="output" Style="{StaticResource OutputStyle}" Padding="5, 5, 5, 5" Text="Ready"/>
+                    </ScrollViewer>
+                </Border>
+            </Grid>
+        </Border>
+        <!-- Footer -->
+        <StackPanel Grid.Row="2" VerticalAlignment="Bottom">
+            <TextBlock Margin="5, 5, 5, 5"  Style="{StaticResource FooterStyle}" 
+                       Text="© 2012 ZeroC. All rights reserved."/>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp b/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp
new file mode 100644
index 00000000000..25910c04340
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/MainPage.xaml.cpp
@@ -0,0 +1,263 @@
+//
+// MainPage.xaml.cpp
+// Implementation of the MainPage class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+#include <iostream>
+
+using namespace std;
+using namespace hello;
+using namespace Demo;
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+class DispatcherI : virtual public Ice::Dispatcher
+{
+public:
+
+    DispatcherI(CoreDispatcher^ dispatcher) :
+        _dispatcher(dispatcher)
+    {
+    }
+
+    virtual void dispatch(const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr&)
+    {
+        _dispatcher->RunAsync(CoreDispatcherPriority::Normal, 
+                              ref new DispatchedHandler([=]()
+                                    {
+                                        call->run();
+                                    }, CallbackContext::Any));
+    }
+
+private:
+
+    CoreDispatcher^ _dispatcher;
+};
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+MainPage::MainPage()
+{
+    InitializeComponent();
+    mode->SelectedIndex = 0;
+    Ice::InitializationData id;
+    id.dispatcher = new DispatcherI(this->Dispatcher);  
+    _communicator = Ice::initialize(id);
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void MainPage::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    (void) e; // Unused parameter
+}
+
+HelloCallback::HelloCallback(MainPage^ page) :
+    _page(page)
+{
+}
+
+void 
+HelloCallback::helloSent(bool sent)
+{
+    _page->helloSent(sent);
+}
+
+void 
+HelloCallback::helloSuccess()
+{
+    _page->helloSuccess();
+}
+
+void
+HelloCallback::helloFailure(const Ice::Exception& ex)
+{
+    _page->helloFailure(ex);
+}
+
+void 
+hello::MainPage::helloSuccess()
+{
+    print("Ready.");
+}
+
+void
+hello::MainPage::helloFailure(const Ice::Exception& ex)
+{
+    ostringstream os;
+    os << ex;
+    print(os.str());
+}
+
+void
+hello::MainPage::helloSent(bool)
+{
+    if(mode->SelectedIndex == 0 || mode->SelectedIndex == 1)
+    {
+        print("Waiting for response.");
+    }
+    else
+    {
+        print("Ready.");
+    }
+}
+
+Demo::HelloPrx
+hello::MainPage::proxy()
+{
+    string h = IceUtil::wstringToString(hostname->Text->Data());
+    Ice::ObjectPrx prx = _communicator->stringToProxy("hello:tcp -h " + h + " -p 10000:ssl -h " + h + " -p 10001:udp -h " + h + " -p 10000");
+    switch(mode->SelectedIndex)
+    {
+        case 0:
+        {
+            prx = prx->ice_twoway();
+            break;
+        }
+        case 1:
+        {
+            prx = prx->ice_twoway()->ice_secure(true);
+            break;
+        }
+        case 2:
+        {
+            prx = prx->ice_oneway();
+            break;
+        }
+        case 3:
+        {
+            prx = prx->ice_batchOneway();
+            break;
+        }
+        case 4:
+        {
+            prx = prx->ice_oneway()->ice_secure(true);
+            break;
+        }
+        case 5:
+        {
+            prx = prx->ice_batchOneway()->ice_secure(true);
+            break;
+        }
+        case 6:
+        {
+            prx = prx->ice_datagram();
+            break;
+        }
+        case 7:
+        {
+            prx = prx->ice_batchDatagram();
+            break;
+        }
+        default:
+        {
+            break;
+        }
+    }
+
+    if(timeout->Value > 0)
+    {
+        prx = prx->ice_timeout((int)timeout->Value * 1000);
+    }
+    return Demo::HelloPrx::uncheckedCast(prx);
+}
+
+bool
+hello::MainPage::isBatch()
+{
+    return mode->SelectedIndex == 3 || mode->SelectedIndex == 5 || mode->SelectedIndex == 7;
+}
+
+void
+hello::MainPage::hello_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    try
+    {
+        HelloPrx prx = proxy();
+        if(!prx)
+        {
+            return;
+        }
+
+        if(!isBatch())
+        {
+            print("Sending sayHello request.");
+            Demo::Callback_Hello_sayHelloPtr cb = 
+                Demo::newCallback_Hello_sayHello(new HelloCallback(this), 
+                                                 &HelloCallback::helloSuccess,
+                                                 &HelloCallback::helloFailure, 
+                                                 &HelloCallback::helloSent);
+            prx->begin_sayHello(static_cast<int>(delay->Value * 1000), cb);
+        }
+        else
+        {
+            print("Queued sayHello request.");
+            prx->sayHello((int)(delay->Value * 1000));
+            flush->IsEnabled = true;
+        }
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << ex;
+        print(os.str());
+    }
+}
+
+void hello::MainPage::shutdown_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    try
+    {
+        HelloPrx prx = proxy();
+        if(!prx)
+        {
+            return;
+        }
+        prx = Demo::HelloPrx::uncheckedCast(prx->ice_twoway());
+        prx->begin_shutdown();
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << ex;
+        print(os.str());
+    }
+}
+
+void hello::MainPage::flush_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    try
+    {
+        flush->IsEnabled = false;
+        Ice::Callback_Communicator_flushBatchRequestsPtr cb = 
+            Ice::newCallback_Communicator_flushBatchRequests(new HelloCallback(this), &HelloCallback::helloFailure);
+        _communicator->begin_flushBatchRequests(cb);
+        print("Flushed batch requests.");
+    }
+    catch(const Ice::Exception& ex)
+    {
+        ostringstream os;
+        os << ex;
+        print(os.str());
+    }
+}
+
+void
+MainPage::print(const std::string& message)
+{
+    output->Text = ref new String(IceUtil::stringToWstring(message).c_str());
+}
diff --git a/cpp/demo/Ice/winrt/hello/MainPage.xaml.h b/cpp/demo/Ice/winrt/hello/MainPage.xaml.h
new file mode 100644
index 00000000000..0ad44475d25
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/MainPage.xaml.h
@@ -0,0 +1,67 @@
+//
+// MainPage.xaml.h
+// Declaration of the MainPage class.
+//
+
+#pragma once
+
+#include "MainPage.g.h"
+#include <IceUtil/IceUtil.h>
+#include <Ice/Ice.h>
+#include <Hello.h>
+
+namespace hello
+{
+    ref class MainPage;
+
+    class HelloCallback : virtual public IceUtil::Shared
+    {
+    public:
+
+        HelloCallback(MainPage^);
+
+        void helloSent(bool);
+
+        void helloSuccess();
+
+        void helloFailure(const Ice::Exception&);
+        
+    private:
+
+        MainPage^ _page;
+    };
+    typedef IceUtil::Handle<HelloCallback> HelloCallbackPtr;
+
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public ref class MainPage sealed
+    {
+    public:
+
+        MainPage();
+
+    protected:
+
+        virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+        
+
+    private:
+
+        friend class HelloCallback;
+
+        Demo::HelloPrx proxy();
+        bool isBatch();
+
+        void helloSuccess();
+        void helloFailure(const Ice::Exception& ex);
+        void helloSent(bool);
+        void print(const std::string&);
+
+        void hello_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+        void shutdown_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+        void flush_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+
+        Ice::CommunicatorPtr _communicator;
+    };
+}
diff --git a/cpp/demo/Ice/winrt/hello/Package.appxmanifest b/cpp/demo/Ice/winrt/hello/Package.appxmanifest
new file mode 100644
index 00000000000..08add953e5e
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/Package.appxmanifest
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+  <Identity Name="be9e42f6-f89b-4671-8754-e408ccec94f0" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>Ice Hello Demo</DisplayName>
+    <PublisherDisplayName>ZeroC</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.2.0</OSMinVersion>
+    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="hello.App">
+      <VisualElements DisplayName="Ice Hello Demo" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="hello" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="privateNetworkClientServer" />
+    <Capability Name="internetClientServer" />
+    <Capability Name="internetClient" />
+  </Capabilities>
+  <Extensions>
+    <Extension Category="windows.certificates">
+      <Certificates>
+        <Certificate StoreName="Root" Content="cacert.pem" />
+        <Certificate StoreName="CA" Content="cacert.pem" />
+        <TrustFlags ExclusiveTrust="true" />
+      </Certificates>
+    </Extension>
+  </Extensions>
+</Package>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/hello/README.txt b/cpp/demo/Ice/winrt/hello/README.txt
new file mode 100644
index 00000000000..8620323519a
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/README.txt
@@ -0,0 +1,24 @@
+This demo illustrates how to invoke ordinary (twoway) operations,
+as well as how to make oneway, datagram, secure, and batched 
+invocations.
+
+First follow the instructions in the C++ Ice hello demo README 
+to start the server.
+
+To start the client first build the demo using "Build hello" command
+in "Build" menu.
+
+Deploy the demo using "Deploy hello" command in "Build" menu.
+
+Then start the "Ice Hello Demo" application from Windows Start menu.
+
+To test timeouts you can use the timeout slider to set a timeout in the
+client proxy. And the delay slider to set a delayed response in the server
+to cause a timeout.
+
+You will notice that two "Hello World!" messages will be printed by
+the server in this case. This is because the sayHello method is marked
+as idempotent in the slice, meaning that Ice does not need to follow
+the at-most-once retry semantics. 
+
+See the manual for more information about retry behavior.
diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj b/cpp/demo/Ice/winrt/hello/hello.vcxproj
new file mode 100644
index 00000000000..4813772fea8
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{dc1a22cc-0ad9-40cf-9159-952962f71520}</ProjectGuid>
+    <RootNamespace>hello</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PackageCertificateKeyFile>key.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>22710365E93A16EA1983847965CFC340086BE8B1</PackageCertificateThumbprint>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Hello.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="MainPage.xaml.h">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Common\StandardStyles.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="..\..\..\..\..\certs\cacert.pem">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="Hello.ice" />
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\Logo.png" />
+    <Image Include="Assets\SmallLogo.png" />
+    <Image Include="Assets\StoreLogo.png" />
+    <Image Include="Assets\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="Hello.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="IceWinRT, Version=3.4" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_ProjectVersion="1" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters b/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters
new file mode 100644
index 00000000000..100a422cec0
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/hello.vcxproj.filters
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>dc1a22cc-0ad9-40cf-9159-952962f71520</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets">
+      <UniqueIdentifier>8f4fb9c1-d4ac-4879-aadd-7a0cd8c1ab92</UniqueIdentifier>
+    </Filter>
+    <Page Include="Common\StandardStyles.xaml">
+      <Filter>Common</Filter>
+    </Page>
+    <Image Include="Assets\Logo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SmallLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SplashScreen.png">
+      <Filter>Assets</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp" />
+    <ClCompile Include="pch.cpp" />
+    <ClCompile Include="Hello.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h" />
+    <ClInclude Include="MainPage.xaml.h" />
+    <ClInclude Include="Hello.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Hello.ice" />
+    <None Include="..\..\..\..\..\certs\cacert.pem" />
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="README.txt" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/demo/Ice/winrt/hello/pch.cpp b/cpp/demo/Ice/winrt/hello/pch.cpp
new file mode 100644
index 00000000000..f3963b9b14c
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/pch.cpp
@@ -0,0 +1,6 @@
+//
+// pch.cpp
+// Include the standard header and generate the precompiled header.
+//
+
+#include "pch.h"
diff --git a/cpp/demo/Ice/winrt/hello/pch.h b/cpp/demo/Ice/winrt/hello/pch.h
new file mode 100644
index 00000000000..77252482cf2
--- /dev/null
+++ b/cpp/demo/Ice/winrt/hello/pch.h
@@ -0,0 +1,9 @@
+//
+// pch.h
+// Header for standard system include files.
+//
+
+#pragma once
+
+#include <collection.h>
+#include "App.xaml.h"
diff --git a/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj b/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj
index 0c4c23247da..eb9fac2ee8d 100644
--- a/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj
+++ b/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj.filters b/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj.filters
index 5a57dc90ce9..bc0a7eac66f 100644
--- a/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj.filters
+++ b/cpp/demo/IceBox/hello/IceBox.hello.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj b/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj
index 3540801b3e3..49db4ec8337 100644
--- a/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj
+++ b/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj
@@ -87,7 +87,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBoxd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloserviced.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBoxd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloserviced.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -160,7 +160,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBox.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloservice.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -197,7 +197,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,7 +213,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBox.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloservice.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -251,7 +251,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj.filters b/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj.filters
index 7a1f9a90adf..bcee5dbbfe9 100644
--- a/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj.filters
+++ b/cpp/demo/IceBox/hello/IceBox.hello.server.vcxproj.filters
@@ -35,5 +35,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
+    <None Include="config.icebox" />
+    <None Include="config.service" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj
index eeeb79690c4..fa4aa15657d 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj.filters b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj.filters
index 9fd8f376f85..db4d9dca48f 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj
index 3960a32f14b..c02b91910b6 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -224,7 +224,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj.filters b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj.filters
index a18ababf14a..5cfc496fe9b 100644
--- a/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/allocate/IceGrid.allocate.server.vcxproj.filters
@@ -38,5 +38,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.grid" />
+    <None Include="application-single.xml" />
+    <None Include="application-multiple.xml" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj
index 8df6bd1d55f..e62218decf8 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj.filters b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj.filters
index ef234a6e029..6eec2203a9d 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj
index 23bc4ebfe34..c92cce27921 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj
@@ -87,7 +87,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -104,7 +104,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBoxd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloserviced.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -142,7 +142,7 @@
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBoxd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloserviced.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -160,7 +160,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBox.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloservice.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -197,7 +197,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_USRDLL;_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,7 +213,7 @@
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceBox.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>helloservice.dll</OutputFile>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -250,7 +250,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj.filters b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj.filters
index 035ccc40d5c..46471d642df 100644
--- a/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/icebox/IceGrid.icebox.server.vcxproj.filters
@@ -35,5 +35,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.grid" />
+    <None Include="application.xml" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj b/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj
index 3ed07f1bf91..6583fe24eeb 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj.filters b/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj.filters
index bd0e28498a5..5822624640c 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj b/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj
index 3a9f842c523..ae68e175f30 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -227,7 +227,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj.filters b/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj.filters
index 845750d4cbe..fc2cf31f11b 100644
--- a/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/replication/IceGrid.replication.server.vcxproj.filters
@@ -38,5 +38,11 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.master" />
+    <None Include="config.node1" />
+    <None Include="config.node2" />
+    <None Include="config.replica1" />
+    <None Include="config.replica2" />
+    <None Include="application.xml" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/replication/config.node1 b/cpp/demo/IceGrid/replication/config.node1
index b65ed9fcb56..3fe185fda80 100644
--- a/cpp/demo/IceGrid/replication/config.node1
+++ b/cpp/demo/IceGrid/replication/config.node1
@@ -7,7 +7,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:d
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node1
-IceGrid.Node.Endpoints=default -t 10000
+IceGrid.Node.Endpoints=default -t 10000 -h localhost
 IceGrid.Node.Data=db/node1
 
 Ice.StdErr=db/node1/stderr.txt
diff --git a/cpp/demo/IceGrid/replication/config.node2 b/cpp/demo/IceGrid/replication/config.node2
index 3e48f5be206..a9b9fa5df4d 100644
--- a/cpp/demo/IceGrid/replication/config.node2
+++ b/cpp/demo/IceGrid/replication/config.node2
@@ -7,7 +7,7 @@ Ice.Default.Locator=DemoIceGrid/Locator:default -h localhost -p 12000 -t 10000:d
 # IceGrid node configuration.
 #
 IceGrid.Node.Name=node2
-IceGrid.Node.Endpoints=default -t 10000
+IceGrid.Node.Endpoints=default -t 10000 -h localhost
 IceGrid.Node.Data=db/node2
 
 Ice.StdErr=db/node2/stderr.txt
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj b/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj
index 11138f9bf8f..12935093b57 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj.filters b/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj.filters
index c3bfdef3651..983867a8249 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj b/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj
index 0428a9f4aaf..c60d01fbc3d 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -227,7 +227,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj.filters b/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj.filters
index 66a2f88cfa1..bb604622222 100644
--- a/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/secure/IceGrid.secure.server.vcxproj.filters
@@ -38,5 +38,11 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="application.xml" />
+    <None Include="config.admin" />
+    <None Include="config.master" />
+    <None Include="config.node" />
+    <None Include="config.slave" />
+    <None Include="config.glacier2" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj
index 01c91bf27a2..c422dfedaf5 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj.filters b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj.filters
index debe858c514..0e43957cae2 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj
index 7c9cf01f311..3afb7a65c31 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj.filters b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj.filters
index e42a5b7a8f2..b389d37aea6 100644
--- a/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/sessionActivation/IceGrid.sessionActivation.server.vcxproj.filters
@@ -38,5 +38,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="application.xml" />
+    <None Include="config.grid" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj b/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj
index 005a28e91d2..d70b6711da6 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IceGridd.lib;Glacier2d.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IceGrid.lib;Glacier2.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj.filters b/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj.filters
index 5150b30f2f0..275f2d307a7 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj.filters
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.client.vcxproj.filters
@@ -32,5 +32,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj b/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj
index bf6b3e652f3..93301b127b9 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -225,7 +225,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj.filters b/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj.filters
index a4abced3f8a..a31f47b910a 100644
--- a/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj.filters
+++ b/cpp/demo/IceGrid/simple/IceGrid.simple.server.vcxproj.filters
@@ -38,5 +38,9 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="application.xml" />
+    <None Include="application_with_replication.xml" />
+    <None Include="application_with_template.xml" />
+    <None Include="config.grid" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj b/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj
index 671517e5f48..634836808a4 100644
--- a/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj
+++ b/cpp/demo/IcePatch2/MFC/IcePatch2.MFC.client.vcxproj
@@ -88,7 +88,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -103,7 +103,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IcePatch2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
@@ -125,7 +125,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;_DEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -140,7 +140,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;IcePatch2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
@@ -159,7 +159,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -173,7 +173,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IcePatch2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -195,7 +195,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_MBCS;NDEBUG;VC_EXTRALEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -209,7 +209,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;IcePatch2.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <EntryPointSymbol>wWinMainCRTStartup</EntryPointSymbol>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -271,7 +271,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj b/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj
index f62dccc1929..53891f6add3 100644
--- a/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj
+++ b/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj.filters b/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj.filters
index adcd8b7c80f..0fdb7cd2b5d 100644
--- a/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj.filters
+++ b/cpp/demo/IceStorm/clock/IceStorm.clock.publisher.vcxproj.filters
@@ -32,5 +32,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.pub" />
+    <None Include="config.icebox" />
+    <None Include="config.service" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj b/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj
index 2b9ecfb4ce2..ecb697af0bf 100644
--- a/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj
+++ b/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -217,7 +217,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj.filters b/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj.filters
index 5ac20c35cd3..b11c1b78f25 100644
--- a/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj.filters
+++ b/cpp/demo/IceStorm/clock/IceStorm.clock.subscriber.vcxproj.filters
@@ -32,5 +32,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.sub" />
+    <None Include="config.icebox" />
+    <None Include="config.service" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj b/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj
index ebcc8286aa5..738b311b147 100644
--- a/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj
+++ b/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj.filters b/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj.filters
index be29fd67208..3ba8fdd47c9 100644
--- a/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj.filters
+++ b/cpp/demo/IceStorm/counter/IceStorm.counter.client.vcxproj.filters
@@ -38,5 +38,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj b/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj
index b584b6987d1..73e79bf9cef 100644
--- a/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj
+++ b/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -224,7 +224,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj.filters b/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj.filters
index 680bd1b1719..b409e406e57 100644
--- a/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj.filters
+++ b/cpp/demo/IceStorm/counter/IceStorm.counter.server.vcxproj.filters
@@ -38,5 +38,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
+    <None Include="config.icebox" />
+    <None Include="config.service" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj b/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj
index 5d3a8b168d8..fffa185082b 100644
--- a/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj
+++ b/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj.filters b/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj.filters
index efd21d0093c..8ad8119a948 100644
--- a/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj.filters
+++ b/cpp/demo/IceStorm/replicated/IceStorm.replicated.publisher.vcxproj.filters
@@ -32,5 +32,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="application.xml" />
+    <None Include="config.pub" />
+    <None Include="config.grid" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj b/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj
index 6978ca8f634..05b676197e4 100644
--- a/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj
+++ b/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -217,7 +217,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj.filters b/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj.filters
index 9e1c176f8f8..63954f729f2 100644
--- a/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj.filters
+++ b/cpp/demo/IceStorm/replicated/IceStorm.replicated.subscriber.vcxproj.filters
@@ -32,5 +32,8 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="application.xml" />
+    <None Include="config.sub" />
+    <None Include="config.grid" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj
index f62ab418741..28ad5e238c1 100644
--- a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj
+++ b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -227,7 +227,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj.filters b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj.filters
index e1a226f03f7..4113bd289d0 100644
--- a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj.filters
+++ b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.publisher.vcxproj.filters
@@ -32,5 +32,12 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.pub" />
+    <None Include="config.ib1" />
+    <None Include="config.ib2" />
+    <None Include="config.ib3" />
+    <None Include="config.s1" />
+    <None Include="config.s2" />
+    <None Include="config.s3" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj
index 98c04a96d6c..2243cbeee78 100644
--- a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj
+++ b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj
@@ -78,7 +78,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -110,7 +110,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -126,7 +126,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStormd.lib;IceGridd.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -139,7 +139,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -170,7 +170,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -185,7 +185,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>IceStorm.lib;IceGrid.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -221,7 +221,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj.filters b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj.filters
index 3e9978e7ec2..6d0f930ca5d 100644
--- a/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj.filters
+++ b/cpp/demo/IceStorm/replicated2/IceStorm.replicated2.subscriber.vcxproj.filters
@@ -32,5 +32,12 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.sub" />
+    <None Include="config.ib1" />
+    <None Include="config.ib2" />
+    <None Include="config.ib3" />
+    <None Include="config.s1" />
+    <None Include="config.s2" />
+    <None Include="config.s3" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj
index 803827e7a45..22cb72c76b9 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj
+++ b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -112,7 +112,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -128,7 +128,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -141,7 +141,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -156,7 +156,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -172,7 +172,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
index efe57e68491..d0c36409a0d 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
+++ b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.client.vcxproj.filters
@@ -47,5 +47,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj
index e986b48523b..4bd0bac3a4a 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj
+++ b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
index 0a1ed8ae58e..a36d6931452 100644
--- a/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
+++ b/cpp/demo/book/evictor_filesystem/book.evictor_filesystem.server.vcxproj.filters
@@ -50,5 +50,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj b/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj
index 61e6cf5159e..a7b1f01a745 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj
+++ b/cpp/demo/book/lifecycle/book.lifecycle.client.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -258,7 +258,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj b/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj
index 1d6c3faac6a..3081db83a69 100644
--- a/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj
+++ b/cpp/demo/book/lifecycle/book.lifecycle.server.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj b/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj
index 0a9433c49cc..ec6f0df13dd 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj
+++ b/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -112,7 +112,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -128,7 +128,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -141,7 +141,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -156,7 +156,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -172,7 +172,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -228,7 +228,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters b/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters
index 0ba7cb542fa..6a24a524a87 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters
+++ b/cpp/demo/book/map_filesystem/book.map_filesystem.client.vcxproj.filters
@@ -47,5 +47,6 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.client" />
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj
index 1cd7e9f7038..32d77e145e7 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj
+++ b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freeze.lib;Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Freezed.lib;Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -218,20 +218,20 @@
   <ItemGroup>
     <None Include="Filesystem.ice" />
     <CustomBuild Include="FilesystemDB.ice">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
-"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
-"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
-"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
-"$(IceHome)\bin\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityFileEntryMap,Ice::Identity,FilesystemDB::FileEntry IdentityFileEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
+"$(IceBin)\slice2freeze.exe" -I"$(IceHome)\slice" -I. --ice --dict FilesystemDB::IdentityDirectoryEntryMap,Ice::Identity,FilesystemDB::DirectoryEntry IdentityDirectoryEntryMap FilesystemDB.ice "$(IceHome)\slice\Ice\Identity.ice"
 </Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">IdentityFileEntryMap.cpp;IdentityFileEntryMap.h;IdentityDirectoryEntryMap.cpp;IdentityDirectoryEntryMap.h;%(Outputs)</Outputs>
     </CustomBuild>
@@ -243,7 +243,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_IncludePath="." ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters
index e26f492eab9..b1b9bfe2867 100644
--- a/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters
+++ b/cpp/demo/book/map_filesystem/book.map_filesystem.server.vcxproj.filters
@@ -56,6 +56,7 @@
       <Filter>Resource Files</Filter>
     </None>
     <None Include="README" />
+    <None Include="config.server" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="FilesystemDB.ice">
diff --git a/cpp/demo/book/printer/book.printer.client.vcxproj b/cpp/demo/book/printer/book.printer.client.vcxproj
index a5c30d7041a..a408e93a921 100644
--- a/cpp/demo/book/printer/book.printer.client.vcxproj
+++ b/cpp/demo/book/printer/book.printer.client.vcxproj
@@ -79,7 +79,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -94,7 +94,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -110,7 +110,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>dummyinclude;.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>dummyinclude;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -152,7 +152,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -184,7 +184,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/printer/book.printer.server.vcxproj b/cpp/demo/book/printer/book.printer.server.vcxproj
index 0546ebb5caf..5231bbc093f 100644
--- a/cpp/demo/book/printer/book.printer.server.vcxproj
+++ b/cpp/demo/book/printer/book.printer.server.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -216,7 +216,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj b/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj
index c854da57030..c035cd1fd1d 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj
+++ b/cpp/demo/book/simple_filesystem/book.simple_filesystem.client.vcxproj
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -112,7 +112,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -128,7 +128,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -141,7 +141,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -156,7 +156,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -172,7 +172,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -187,7 +187,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -222,7 +222,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj b/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj
index de679f43508..0da907bc459 100644
--- a/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj
+++ b/cpp/demo/book/simple_filesystem/book.simple_filesystem.server.vcxproj
@@ -81,7 +81,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -96,7 +96,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -112,7 +112,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -127,7 +127,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -138,7 +138,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -170,7 +170,7 @@
     </BuildLog>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(IceHome)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -186,7 +186,7 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(IceHome)\lib\vc100\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -223,7 +223,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" />
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_VerboseLevel="1" ZerocIce_ProjectVersion="1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
 \ No newline at end of file
diff --git a/cpp/demo/demo-winrt.sln b/cpp/demo/demo-winrt.sln
new file mode 100644
index 00000000000..fb9c33a7d0e
--- /dev/null
+++ b/cpp/demo/demo-winrt.sln
@@ -0,0 +1,87 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bidir", "Ice\winrt\bidir\bidir.vcxproj", "{4EF04DDD-1B81-4DC7-ADF2-290E22008616}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hello", "Ice\winrt\hello\hello.vcxproj", "{DC1A22CC-0AD9-40CF-9159-952962F71520}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ice", "Ice", "{2EA0DDEB-E230-4ABE-8257-3418A534FD0F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Glacier2", "Glacier2", "{B4B6E47C-00B7-439B-A3D7-04A80F4643B8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chat", "Glacier2\winrt\chat\chat.vcxproj", "{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.ActiveCfg = Debug|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Build.0 = Debug|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|ARM.Deploy.0 = Debug|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Build.0 = Debug|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|Win32.Deploy.0 = Debug|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.ActiveCfg = Debug|x64
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Build.0 = Debug|x64
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Debug|x64.Deploy.0 = Debug|x64
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.ActiveCfg = Release|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Build.0 = Release|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|ARM.Deploy.0 = Release|ARM
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.ActiveCfg = Release|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Build.0 = Release|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|Win32.Deploy.0 = Release|Win32
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.ActiveCfg = Release|x64
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Build.0 = Release|x64
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616}.Release|x64.Deploy.0 = Release|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.ActiveCfg = Debug|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Build.0 = Debug|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|ARM.Deploy.0 = Debug|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Build.0 = Debug|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|Win32.Deploy.0 = Debug|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.ActiveCfg = Debug|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Build.0 = Debug|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Debug|x64.Deploy.0 = Debug|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.ActiveCfg = Release|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Build.0 = Release|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|ARM.Deploy.0 = Release|ARM
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.ActiveCfg = Release|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Build.0 = Release|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|Win32.Deploy.0 = Release|Win32
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.ActiveCfg = Release|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Build.0 = Release|x64
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC}.Release|x64.Deploy.0 = Release|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.ActiveCfg = Debug|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Build.0 = Debug|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|ARM.Deploy.0 = Debug|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Build.0 = Debug|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|Win32.Deploy.0 = Debug|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.ActiveCfg = Debug|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Build.0 = Debug|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Debug|x64.Deploy.0 = Debug|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.ActiveCfg = Release|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Build.0 = Release|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|ARM.Deploy.0 = Release|ARM
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.ActiveCfg = Release|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Build.0 = Release|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|Win32.Deploy.0 = Release|Win32
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.ActiveCfg = Release|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Build.0 = Release|x64
+		{DC1A22CC-0AD9-40CF-9159-952962F71520}.Release|x64.Deploy.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{4EF04DDD-1B81-4DC7-ADF2-290E22008616} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F}
+		{C56BDB5E-9829-49D6-B5EB-9089AD7E89CC} = {B4B6E47C-00B7-439B-A3D7-04A80F4643B8}
+		{DC1A22CC-0AD9-40CF-9159-952962F71520} = {2EA0DDEB-E230-4ABE-8257-3418A534FD0F}
+	EndGlobalSection
+EndGlobal
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h
index da977b1728a..a970ac4d11a 100644
--- a/cpp/include/Glacier2/Glacier2.h
+++ b/cpp/include/Glacier2/Glacier2.h
@@ -9,11 +9,13 @@
 
 #ifndef GLACIER2_H
 #define GLACIER2_H
-
+#include <IceUtil/Config.h>
 #include <Glacier2/Router.h>
 #include <Glacier2/Session.h>
 #include <Glacier2/PermissionsVerifier.h>
-#include <Glacier2/Application.h>
+#ifndef ICE_OS_WINRT
+#   include <Glacier2/Application.h>
+#endif
 #include <Glacier2/SessionHelper.h>
 
 #endif
diff --git a/cpp/include/Glacier2/Makefile.mak b/cpp/include/Glacier2/Makefile.mak
index d703e7f43db..2c8f6fc06a9 100644
--- a/cpp/include/Glacier2/Makefile.mak
+++ b/cpp/include/Glacier2/Makefile.mak
@@ -8,9 +8,12 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= Glacier2
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
+
 install::
 	@if not exist "$(install_includedir)\Glacier2" \
 	    @echo "Creating $(install_includedir)\Glacier2..." && \
@@ -19,3 +22,17 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\Glacier2"
+
+!else
+
+SDK_HEADERS	= $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Application.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Glacier2.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PermissionsVerifier.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Router.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\SSLInfo.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Session.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\SessionHelper.h
+
+all::	$(SDK_HEADERS)
+
+!endif
diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h
index 263c7f69ea0..687c680ce04 100644
--- a/cpp/include/Glacier2/SessionHelper.h
+++ b/cpp/include/Glacier2/SessionHelper.h
@@ -51,7 +51,7 @@ public:
 };
 typedef IceUtil::Handle<SessionHelper> SessionHelperPtr;
 
-class GLACIER2_API SessionCallback : public IceUtil::Shared
+class GLACIER2_API SessionCallback : virtual public IceUtil::Shared
 {
 
 public:
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h
index 09743cb6750..448c88eb97d 100644
--- a/cpp/include/Ice/Application.h
+++ b/cpp/include/Ice/Application.h
@@ -14,7 +14,6 @@
 
 #include <IceUtil/Mutex.h>
 
-
 namespace Ice
 {
     enum SignalPolicy { HandleSignals, NoSignalHandling } ;
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 79cecd3336e..5322bb31717 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -22,12 +22,14 @@
 #include <vector>
 #include <map>
 
-#if defined(_WIN32)
-#   include <process.h>
-#else
-#   include <sys/types.h>
-#   include <unistd.h>
-#   include <cstddef>
+#ifndef ICE_OS_WINRT
+#   if defined(_WIN32)
+#      include <process.h>
+#   else
+#      include <sys/types.h>
+#      include <unistd.h>
+#      include <cstddef>
+#   endif
 #endif
 
 //
diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h
index 6fab6a50e9e..32b9a01f8d1 100644
--- a/cpp/include/Ice/DynamicLibraryF.h
+++ b/cpp/include/Ice/DynamicLibraryF.h
@@ -26,5 +26,4 @@ ICE_API IceUtil::Shared* upCast(DynamicLibraryList*);
 typedef Handle<DynamicLibraryList> DynamicLibraryListPtr;
 
 }
-
 #endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index c17fc42565a..27cdf17dcd6 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -10,6 +10,7 @@
 #ifndef ICE_ICE_H
 #define ICE_ICE_H
 
+#include <IceUtil/Config.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
 #include <Ice/Properties.h>
@@ -27,7 +28,9 @@
 #include <Ice/OutgoingAsync.h>
 #include <Ice/IncomingAsync.h>
 #include <Ice/Process.h>
+#ifndef ICE_OS_WINRT
 #include <Ice/Application.h>
+#endif
 #include <Ice/Connection.h>
 #include <Ice/ConnectionAsync.h>
 #include <Ice/Functional.h>
diff --git a/cpp/include/Ice/Makefile.mak b/cpp/include/Ice/Makefile.mak
index 674c4a64288..c6b9da817a6 100644
--- a/cpp/include/Ice/Makefile.mak
+++ b/cpp/include/Ice/Makefile.mak
@@ -8,9 +8,12 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= Ice
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
+
 install::
 	@if not exist "$(install_includedir)\Ice" \
 	    @echo "Creating $(install_includedir)\Ice..." && \
@@ -19,3 +22,99 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\Ice"
+
+!else
+
+SDK_HEADERS =	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BasicStream.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Buffer.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\BuiltinSequences.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Communicator.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\CommunicatorAsync.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\CommunicatorF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Connection.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionAsync.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionFactoryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionIF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionMonitorF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Current.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Direct.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\DispatchInterceptor.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Dispatcher.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\DynamicLibrary.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\DynamicLibraryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Endpoint.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointFactory.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointFactoryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointIF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointTypes.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FacetMap.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FactoryTable.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FactoryTableInit.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Functional.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\GCCountMap.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\GCShared.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Handle.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Ice.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IconvStringConverter.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Identity.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ImplicitContext.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ImplicitContextF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Incoming.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IncomingAsync.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IncomingAsyncF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Initialize.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\InstanceF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LocalException.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LocalObject.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LocalObjectF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Locator.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LocatorF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Logger.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LoggerF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\LoggerUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Object.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectAdapter.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectAdapterF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectAdapterFactoryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectFactory.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ObjectFactoryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Outgoing.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\OutgoingAsync.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\OutgoingAsyncF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Plugin.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PluginF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Process.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProcessF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Properties.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\PropertiesF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Protocol.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProtocolPluginFacade.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProtocolPluginFacadeF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Proxy.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyFactoryF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ProxyHandle.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ReferenceF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RequestHandlerF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Router.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RouterF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ServantLocator.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ServantLocatorF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ServantManagerF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\SliceChecksumDict.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\SliceChecksums.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Stats.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\StatsF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Stream.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\StreamF.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\StringConverter.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\UndefSysMacros.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\UserExceptionFactory.h
+
+all:: $(SDK_HEADERS)
+!endif
diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h
index e4cfa0469d7..7290cfdf115 100644
--- a/cpp/include/Ice/ProtocolPluginFacade.h
+++ b/cpp/include/Ice/ProtocolPluginFacade.h
@@ -10,6 +10,7 @@
 #ifndef ICE_PROTOCOL_PLUGIN_FACADE_H
 #define ICE_PROTOCOL_PLUGIN_FACADE_H
 
+#include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
 #include <Ice/ProtocolPluginFacadeF.h>
 #include <Ice/CommunicatorF.h>
diff --git a/cpp/include/IceGrid/Makefile.mak b/cpp/include/IceGrid/Makefile.mak
index dde65e53d0a..ac2bcbf9708 100644
--- a/cpp/include/IceGrid/Makefile.mak
+++ b/cpp/include/IceGrid/Makefile.mak
@@ -8,9 +8,12 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= IceGrid
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
+
 install::
 	@if not exist "$(install_includedir)\IceGrid" \
 	    @echo "Creating $(install_includedir)\IceGrid..." && \
@@ -19,3 +22,20 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\IceGrid"
+
+!else
+
+SDK_HEADERS	= $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Admin.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Descriptor.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FileParser.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceGrid.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Locator.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Observer.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Query.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Registry.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Session.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\UserAccountMapper.h
+
+all::	$(SDK_HEADERS)
+!endif
diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h
index 34be76d838d..8ffa97c6618 100644
--- a/cpp/include/IceSSL/IceSSL.h
+++ b/cpp/include/IceSSL/IceSSL.h
@@ -10,7 +10,10 @@
 #ifndef ICE_SSL_ICE_SSL_H
 #define ICE_SSL_ICE_SSL_H
 
-#include <IceSSL/Plugin.h>
+#include <IceUtil/Config.h>
+#ifndef ICE_OS_WINRT
+#   include <IceSSL/Plugin.h>
+#endif
 #include <IceSSL/EndpointInfo.h>
 #include <IceSSL/ConnectionInfo.h>
 
diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak
index de859bc9f01..244cf1a1039 100644
--- a/cpp/include/IceSSL/Makefile.mak
+++ b/cpp/include/IceSSL/Makefile.mak
@@ -8,9 +8,12 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= IceSSL
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
+
 install::
 	@if not exist "$(install_includedir)\IceSSL" \
 	    @echo "Creating $(install_includedir)\IceSSL..." && \
@@ -19,3 +22,13 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\IceSSL"
+
+!else
+
+SDK_HEADERS =	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceSSL.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\EndpointInfo.h \
+	$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ConnectionInfo.h
+
+all::	$(SDK_HEADERS)
+
+!endif
diff --git a/cpp/include/IceStorm/Makefile.mak b/cpp/include/IceStorm/Makefile.mak
index 9488e63ba26..97075ea5c0b 100644
--- a/cpp/include/IceStorm/Makefile.mak
+++ b/cpp/include/IceStorm/Makefile.mak
@@ -8,9 +8,12 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= IceStorm
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
+
 install::
 	@if not exist "$(install_includedir)\IceStorm" \
 	    @echo "Creating $(install_includedir)\IceStorm..." && \
@@ -19,3 +22,10 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\IceStorm"
+
+!else
+
+SDK_HEADERS	= $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceStorm.h
+
+all::	$(SDK_HEADERS)
+!endif
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 60736ea48cb..643408d5c6c 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -52,6 +52,14 @@
 #   define ICE_32
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER > 1600
+#   include <winapifamily.h>
+#   if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_APP
+#      define ICE_OS_WINRT
+#      define ICE_STATIC_LIBS
+#   endif
+#endif
+
 //
 // Compiler extensions to export and import symbols: see the documentation 
 // for Visual C++, Sun ONE Studio 8 and HP aC++.
@@ -242,3 +250,4 @@ public:
 #endif
 
 #endif
+
diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h
index 14959ff6dc0..5770bbaec79 100644
--- a/cpp/include/IceUtil/CtrlCHandler.h
+++ b/cpp/include/IceUtil/CtrlCHandler.h
@@ -55,7 +55,6 @@ public:
     CtrlCHandlerCallback getCallback() const;
 };
 
-
 class ICE_UTIL_API CtrlCHandlerException : public Exception
 { 
 public:
@@ -66,6 +65,6 @@ public:
     virtual void ice_throw() const;
 };
 
-
 }
+
 #endif
diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h
index 10e507cd4c1..351c597c7c9 100644
--- a/cpp/include/IceUtil/FileUtil.h
+++ b/cpp/include/IceUtil/FileUtil.h
@@ -71,7 +71,11 @@ ICE_UTIL_API int rmdir(const std::string&);
 ICE_UTIL_API int mkdir(const std::string&, int);
 ICE_UTIL_API FILE* fopen(const std::string&, const std::string&);
 ICE_UTIL_API int open(const std::string&, int);
+
+#ifndef ICE_OS_WINRT
 ICE_UTIL_API int getcwd(std::string&);
+#endif
+
 ICE_UTIL_API int unlink(const std::string&);
 ICE_UTIL_API int close(int);
 
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index 8dc365a7a31..783bcb6f945 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -19,7 +19,9 @@
 #include <IceUtil/AbstractMutex.h>
 #include <IceUtil/Cache.h>
 #include <IceUtil/Cond.h>
-#include <IceUtil/CtrlCHandler.h>
+#ifndef ICE_OS_WINRT
+#   include <IceUtil/CtrlCHandler.h>
+#endif
 #include <IceUtil/Exception.h>
 #include <IceUtil/Functional.h>
 #include <IceUtil/Handle.h>
diff --git a/cpp/include/IceUtil/Makefile.mak b/cpp/include/IceUtil/Makefile.mak
index e279f04925e..197bdd3448c 100644
--- a/cpp/include/IceUtil/Makefile.mak
+++ b/cpp/include/IceUtil/Makefile.mak
@@ -8,9 +8,11 @@
 # **********************************************************************
 
 top_srcdir	= ..\..
+INCLUDE_DIR	= IceUtil
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" != "yes"
 install::
 	@if not exist "$(install_includedir)\IceUtil" \
 	    @echo "Creating $(install_includedir)\IceUtil..." && \
@@ -19,3 +21,43 @@ install::
 	@for %i in ( *.h ) do \
 	    @echo Installing %i && \
 	    copy %i "$(install_includedir)\IceUtil"
+
+!else
+
+SDK_HEADERS	= $(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\AbstractMutex.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ArgVector.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Cache.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Cond.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Config.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\CountDownLatch.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\DisableWarnings.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Exception.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\FileUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Functional.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Handle.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\IceUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\InputUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Iterator.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Lock.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Monitor.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Mutex.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\MutexProtocol.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\MutexPtrLock.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\MutexPtrTryLock.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Options.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\OutputUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Random.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\RecMutex.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ScopedArray.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Shared.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\StringUtil.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Thread.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\ThreadException.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Time.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Timer.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\UUID.h \
+		$(SDK_INCLUDE_PATH)\$(INCLUDE_DIR)\Unicode.h
+	
+all::	$(SDK_HEADERS)
+
+!endif
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h
index 467bef3b70a..68c810cf475 100644
--- a/cpp/include/IceUtil/Mutex.h
+++ b/cpp/include/IceUtil/Mutex.h
@@ -134,7 +134,11 @@ Mutex::Mutex(MutexProtocol protocol)
 inline void
 Mutex::init(MutexProtocol)
 {
+#ifdef ICE_OS_WINRT
+    InitializeCriticalSectionEx(&_mutex, 0, 0);
+#else
     InitializeCriticalSection(&_mutex);
+#endif
 }
 
 inline
diff --git a/cpp/include/Makefile.mak b/cpp/include/Makefile.mak
index e756dc4aa8c..67deed6faa9 100644
--- a/cpp/include/Makefile.mak
+++ b/cpp/include/Makefile.mak
@@ -10,18 +10,22 @@
 top_srcdir	= ..
 
 !include $(top_srcdir)/config/Make.rules.mak
-
-SUBDIRS		= Freeze \
-		  Glacier2 \
+SUBDIRS		= Glacier2 \
 		  Ice \
-		  IceBox \
+		  IceSSL \
 		  IceGrid \
+		  IceStorm \
+		  IceUtil
+
+!if "$(WINRT)" != "yes"
+SUBDIRS		= $(SUBDIRS) \
+		  Freeze \
+		  IceBox \
 		  IcePatch2 \
 		  IceSSL \
-		  IceStorm \
-		  IceUtil \
 		  IceXML \
 		  Slice
+!endif
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/cpp/src/Glacier2Lib/SessionHelper.cpp b/cpp/src/Glacier2Lib/SessionHelper.cpp
index 0cc4ac43c97..801b4de1a5a 100644
--- a/cpp/src/Glacier2Lib/SessionHelper.cpp
+++ b/cpp/src/Glacier2Lib/SessionHelper.cpp
@@ -1004,6 +1004,12 @@ Glacier2::SessionFactoryHelper::createInitData()
             os << _timeout;
         }
         initData.properties->setProperty("Ice.Default.Router", os.str());
+#ifndef ICE_OS_WINRT
+        if(_secure)
+        {
+            initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL");
+        }
+#endif
     }
     return initData;
 }
@@ -1014,8 +1020,4 @@ Glacier2::SessionFactoryHelper::setDefaultProperties()
     assert(_initData.properties);
     _initData.properties->setProperty("Ice.ACM.Client", "0");
     _initData.properties->setProperty("Ice.RetryIntervals", "-1");
-    if(_secure)
-    {
-        _initData.properties->setProperty("Ice.Plugin.IceSSL","IceSSL:createIceSSL");
-    }
 }
diff --git a/cpp/src/Glacier2Lib/winrt/.depend.mak b/cpp/src/Glacier2Lib/winrt/.depend.mak
new file mode 100644
index 00000000000..06d130304a2
--- /dev/null
+++ b/cpp/src/Glacier2Lib/winrt/.depend.mak
@@ -0,0 +1,14 @@
+$(ARCH)\$(CONFIG)\PermissionsVerifier$(OBJEXT): ..\PermissionsVerifier.cpp "$(includedir)\Glacier2\PermissionsVerifier.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h"
+$(ARCH)\$(CONFIG)\Router$(OBJEXT): ..\Router.cpp "$(includedir)\Glacier2\Router.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\Router.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h"
+$(ARCH)\$(CONFIG)\SSLInfo$(OBJEXT): ..\SSLInfo.cpp "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h"
+$(ARCH)\$(CONFIG)\Session$(OBJEXT): ..\Session.cpp "$(includedir)\Glacier2\Session.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h"
+$(ARCH)\$(CONFIG)\SessionHelper$(OBJEXT): ..\SessionHelper.cpp "$(includedir)\Glacier2\SessionHelper.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\Ice.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Logger.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Stats.h" "$(includedir)\Ice\CommunicatorAsync.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\ServantLocator.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\ConnectionAsync.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\Router.h" "$(includedir)\Ice\DispatchInterceptor.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\Glacier2\Router.h" "$(includedir)\IceUtil\UUID.h" "$(includedir)\IceUtil\CountDownLatch.h"
+$(ARCH)\$(CONFIG)\RouterF$(OBJEXT): ..\RouterF.cpp "$(includedir)\Glacier2\RouterF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h"
+
+$(HDIR)\PermissionsVerifierF.h ..\PermissionsVerifierF.cpp: "$(slicedir)\Glacier2\PermissionsVerifierF.ice" "$(SLICE2CPP)"
+$(HDIR)\PermissionsVerifier.h ..\PermissionsVerifier.cpp: "$(slicedir)\Glacier2\PermissionsVerifier.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(HDIR)\Router.h ..\Router.cpp: "$(slicedir)\Glacier2\Router.ice" "$(slicedir)\Ice\Router.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(SLICE2CPP)"
+$(HDIR)\RouterF.h ..\RouterF.cpp: "$(slicedir)\Glacier2\RouterF.ice" "$(SLICE2CPP)"
+$(HDIR)\Session.h ..\Session.cpp: "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(SLICE2CPP)"
+$(HDIR)\SSLInfo.h ..\SSLInfo.cpp: "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+
diff --git a/cpp/src/Glacier2Lib/winrt/Makefile.mak b/cpp/src/Glacier2Lib/winrt/Makefile.mak
new file mode 100644
index 00000000000..f1efcc99789
--- /dev/null
+++ b/cpp/src/Glacier2Lib/winrt/Makefile.mak
@@ -0,0 +1,72 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..\..
+LIBNAME		= $(SDK_LIBRARY_PATH)\glacier2.lib
+TARGETS		= $(LIBNAME)
+SOURCE_DIR	= ..
+
+TARGETS         = $(LIBNAME)
+
+OBJS		= $(ARCH)\$(CONFIG)\PermissionsVerifier.obj \
+		  $(ARCH)\$(CONFIG)\Router.obj \
+		  $(ARCH)\$(CONFIG)\SSLInfo.obj \
+		  $(ARCH)\$(CONFIG)\Session.obj \
+		  $(ARCH)\$(CONFIG)\SessionHelper.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+SRCS		= $(SRCS:x86\=)
+SRCS		= $(SRCS:x64\=)
+SRCS		= $(SRCS:Retail\=..\)
+SRCS		= $(SRCS:Debug\=..\)
+
+SRCS		= $(SRCS) \
+		..\RouterF.cpp
+
+HDIR		= $(headerdir)\Glacier2
+SDIR		= $(slicedir)\Glacier2
+
+SLICE_SRCS	= $(SDIR)/PermissionsVerifierF.ice \
+		  $(SDIR)/PermissionsVerifier.ice \
+		  $(SDIR)/Router.ice \
+		  $(SDIR)/RouterF.ice \
+		  $(SDIR)/Session.ice \
+		  $(SDIR)/SSLInfo.ice
+		  
+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DGLACIER2_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+RES_FILE        = $(SOURCE_DIR)\Glacier2.res
+
+SLICE2CPPFLAGS	= --include-dir Glacier2 --dll-export GLACIER2_API $(SLICE2CPPFLAGS)
+
+$(LIBNAME): $(OBJS) $(RES_FILE) sdks
+	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
+	
+depend::
+	del /q .depend.mak
+
+.cpp.depend:
+	$(CXX) /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ /Zs /showIncludes $(CXXFLAGS) $(CPPFLAGS) $< 2>&1 | python.exe $(ice_dir)/config/makedepend-winrt.py  $<
+
+depend:: $(ARCH)\$(CONFIG) $(SLICE_SRCS) $(SRCS) $(SRCS_DEPEND)
+	@if not "$(SLICE_SRCS)" == "" \
+		$(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py
+
+clean::
+	-del /q $(SOURCE_DIR)\PermissionsVerifierF.cpp $(HDIR)\PermissionsVerifierF.h
+	-del /q $(SOURCE_DIR)\PermissionsVerifier.cpp $(HDIR)\PermissionsVerifier.h
+	-del /q $(SOURCE_DIR)\RouterF.cpp $(HDIR)\RouterF.h
+	-del /q $(SOURCE_DIR)\Router.cpp $(HDIR)\Router.h
+	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
+	-del /q $(SOURCE_DIR)\SSLInfo.cpp $(HDIR)\SSLInfo.h
+	-del /q $(RES_FILE)
+
+!include .depend.mak
diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h
index 5725f12a58e..27fdba1a1cb 100644
--- a/cpp/src/Ice/Acceptor.h
+++ b/cpp/src/Ice/Acceptor.h
@@ -25,7 +25,7 @@ public:
     virtual NativeInfoPtr getNativeInfo() = 0;
     virtual void close() = 0;
     virtual void listen() = 0;
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual void startAccept() = 0;
     virtual void finishAccept() = 0;
 #endif
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 0073c442dca..21e642ce572 100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -1309,7 +1309,7 @@ IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const Communicat
     }
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 IceInternal::IncomingConnectionFactory::startAsync(SocketOperation)
 {
@@ -1657,13 +1657,13 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 state = StateFinished;
             }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             //
-            // With IOCP, we close the acceptor now to cancel all the pending asynchronous 
-            // operations. It's important to wait for the pending asynchronous operations 
-            // to return before ConnectionI::finished(). Otherwise, if there was a pending
-            // message waiting to be sent, the connection wouldn't know whether or not the 
-            // send failed or succeeded, potentially breaking at-most-once semantics.
+            // With IOCP and WinRT, we close the acceptor now to cancel all the pending 
+            // asynchronous operations. It's important to wait for the pending asynchronous 
+            // operations to return before ConnectionI::finished(). Otherwise, if there was 
+            // a pending message waiting to be sent, the connection wouldn't know whether 
+            // or not the send failed or succeeded, potentially breaking at-most-once semantics.
             //
             if(_acceptor)
             {
@@ -1685,7 +1685,7 @@ IceInternal::IncomingConnectionFactory::setState(State state)
         case StateFinished:
         {
             assert(_state == StateClosed);
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
             if(_acceptor)
             {
                 _acceptor->close();
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index c73489547b4..846248b8e40 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -175,10 +175,11 @@ public:
     // Operations from EventHandler
     //
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startAsync(SocketOperation);
     virtual bool finishAsync(SocketOperation);
 #endif
+
     virtual void message(ThreadPoolCurrent&);
     virtual void finished(ThreadPoolCurrent&);
     virtual std::string toString() const;
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index c7eec6d2cb9..e1a8e03dd82 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -1132,7 +1132,7 @@ Ice::ConnectionI::createProxy(const Identity& ident) const
     return _instance->proxyFactory()->referenceToProxy(_instance->referenceFactory()->create(ident, self));
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 Ice::ConnectionI::startAsync(SocketOperation operation)
 {
@@ -1578,7 +1578,7 @@ Ice::ConnectionI::finish()
             OutgoingMessage* message = &_sendStreams.front();
             _writeStream.swap(*message->stream);
             
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             //
             // The current message might be sent but not yet removed from _sendStreams. If
             // the response has been received in the meantime, we remove the message from 
@@ -1999,7 +1999,7 @@ Ice::ConnectionI::setState(State state)
                 return;
             }
             _threadPool->finish(this);
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             _transceiver->close();
 #endif
             break;
@@ -2008,7 +2008,7 @@ Ice::ConnectionI::setState(State state)
         case StateFinished:
         {
             assert(_state == StateClosed);
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
             _transceiver->close();
 #endif
             _communicator = 0;
@@ -2257,6 +2257,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingAsyncMessageCallbackPtr>& callb
             //
             message = &_sendStreams.front();
             assert(!message->stream->i);
+#ifndef ICE_OS_WINRT
             if(message->compress && message->stream->b.size() >= 100) // Only compress messages > 100 bytes.
             {
                 //
@@ -2284,6 +2285,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingAsyncMessageCallbackPtr>& callb
             }
             else
             {
+#endif
                 if(message->compress)
                 {
                     //
@@ -2311,7 +2313,9 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingAsyncMessageCallbackPtr>& callb
                 {
                     traceSend(*message->stream, _logger, _traceLevels);
                 }
+#ifndef ICE_OS_WINRT
             }
+#endif
             _writeStream.swap(*message->stream);
 
             //
@@ -2365,7 +2369,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
     //
 
     message.stream->i = message.stream->b.begin();
-
+#ifndef ICE_OS_WINRT
     if(message.compress && message.stream->b.size() >= 100) // Only compress messages larger than 100 bytes.
     {
         //
@@ -2412,6 +2416,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
     }
     else
     {
+#endif
         if(message.compress)
         {
             //
@@ -2461,7 +2466,9 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
 
         _sendStreams.push_back(message);
         _sendStreams.back().adopt(0); // Adopt the stream.
+#ifndef ICE_OS_WINRT
     }
+#endif
 
     _writeStream.swap(*_sendStreams.back().stream);
     scheduleTimeout(SocketOperationWrite, _endpoint->timeout());
@@ -2469,6 +2476,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
     return AsyncStatusQueued;
 }
 
+#ifndef ICE_OS_WINRT
 static string
 getBZ2Error(int bzError)
 {
@@ -2613,6 +2621,7 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse
 
     copy(compressed.b.begin(), compressed.b.begin() + headerSize, uncompressed.b.begin());
 }
+#endif
 
 void
 Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress,
@@ -2640,12 +2649,15 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request
         Byte messageType;
         stream.read(messageType);
         stream.read(compress);
+
+#ifndef ICE_OS_WINRT
         if(compress == 2)
         {
             BasicStream ustream(_instance.get(), Ice::currentProtocolEncoding);
             doUncompress(stream, ustream);
             stream.b.swap(ustream.b);
         }
+#endif
         stream.i = stream.b.begin() + headerSize;
 
         switch(messageType)
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index de6a3a99e86..8648f8f302c 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -128,10 +128,11 @@ public:
     //
     // Operations from EventHandler
     //
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     bool startAsync(IceInternal::SocketOperation);
     bool finishAsync(IceInternal::SocketOperation);
 #endif
+
     virtual void message(IceInternal::ThreadPoolCurrent&);
     virtual void finished(IceInternal::ThreadPoolCurrent&);
     virtual std::string toString() const; // From Connection and EvantHandler.
@@ -213,9 +214,10 @@ private:
     void sendNextMessage(std::vector<IceInternal::OutgoingAsyncMessageCallbackPtr>&);
     IceInternal::AsyncStatus sendMessage(OutgoingMessage&);
 
+#ifndef ICE_OS_WINRT
     void doCompress(IceInternal::BasicStream&, IceInternal::BasicStream&);
     void doUncompress(IceInternal::BasicStream&, IceInternal::BasicStream&);
-
+#endif
     void parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&,
                       IceInternal::ServantManagerPtr&, ObjectAdapterPtr&, IceInternal::OutgoingAsyncPtr&);
     void invokeAll(IceInternal::BasicStream&, Int, Int, Byte,
diff --git a/cpp/src/Ice/ConnectionMonitor.cpp b/cpp/src/Ice/ConnectionMonitor.cpp
index 49e3ab2ba59..7d9e43c7a7c 100644
--- a/cpp/src/Ice/ConnectionMonitor.cpp
+++ b/cpp/src/Ice/ConnectionMonitor.cpp
@@ -128,7 +128,7 @@ IceInternal::ConnectionMonitor::runTimerTask()
         {          
             (*p)->monitor(now);
         }
-        catch(const Exception& ex)
+        catch(const exception& ex)
         {   
             IceUtil::Mutex::Lock sync(*this);
             if(!_instance)
@@ -137,7 +137,7 @@ IceInternal::ConnectionMonitor::runTimerTask()
             }
 
             Error out(_instance->initializationData().logger);
-            out << "exception in connection monitor:\n" << ex;
+            out << "exception in connection monitor:\n" << ex.what();
         }
         catch(...)
         {
diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h
index d9dab988181..58bd62bf900 100644
--- a/cpp/src/Ice/Connector.h
+++ b/cpp/src/Ice/Connector.h
@@ -14,12 +14,6 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/TransceiverF.h>
 
-#ifdef _WIN32
-#   include <winsock2.h>
-#else
-#   define SOCKET int
-#endif
-
 namespace IceInternal
 {
 
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index 09e5b4ae269..15c9007cb9b 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -176,7 +176,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 bool
 IceInternal::DynamicLibrary::load(const string& lib)
 {
-#ifdef _WIN32
+#ifdef ICE_OS_WINRT
+    _hnd = LoadPackagedLibrary(IceUtil::stringToWstring(nativeToUTF8(_stringConverter, lib)).c_str(), 0);
+#elif defined(_WIN32)
     _hnd = LoadLibraryW(IceUtil::stringToWstring(nativeToUTF8(_stringConverter, lib)).c_str());
 #else
 
@@ -250,3 +252,4 @@ IceInternal::DynamicLibraryList::add(const DynamicLibraryPtr& library)
 {
     _libraries.push_back(library);
 }
+
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index ce5d8522484..3543f84ffde 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -10,7 +10,6 @@
 #include <Ice/EndpointI.h>
 #include <Ice/Instance.h>
 #include <Ice/LocalException.h>
-#include <Ice/Network.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/LoggerUtil.h>
 #include <IceUtil/MutexPtrLock.h>
@@ -70,7 +69,7 @@ IceInternal::EndpointI::ice_getHash() const
 }
 
 vector<ConnectorPtr>
-IceInternal::EndpointI::connectors(const vector<struct sockaddr_storage>& addrs) const
+IceInternal::EndpointI::connectors(const vector<Address>& addrs) const
 {
     //
     // This method must be extended by endpoints which use the EndpointHostResolver to create
@@ -145,6 +144,8 @@ IceInternal::EndpointI::parseOption(const string& option, const string& arg, con
     }
 }
 
+#ifndef ICE_OS_WINRT
+
 IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance) :
     IceUtil::Thread("Ice endpoint host resolver thread"),
     _instance(instance),
@@ -178,7 +179,7 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
 void
 IceInternal::EndpointHostResolver::resolve(const string& host, int port, const EndpointIPtr& endpoint,
                                            const EndpointI_connectorsPtr& callback)
-{ 
+{
     //
     // Try to get the addresses without DNS lookup. If this doesn't work, we queue a resolve
     // entry and the thread will take care of getting the endpoint addresses.
@@ -261,3 +262,32 @@ IceInternal::EndpointHostResolver::run()
     }
     _queue.clear();
 }
+
+#else
+
+IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance)
+{
+}
+
+void
+IceInternal::EndpointHostResolver::resolve(const string&, int,
+                                           const EndpointIPtr& endpoint, 
+                                           const EndpointI_connectorsPtr& callback)
+{
+    //
+    // No DNS lookup support with WinRT.
+    //
+    callback->connectors(endpoint->connectors());
+}
+
+void
+IceInternal::EndpointHostResolver::destroy()
+{
+}
+
+void
+IceInternal::EndpointHostResolver::run()
+{
+}
+
+#endif
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index 9f3e4c500bb..02b194cd9e1 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -10,6 +10,7 @@
 #ifndef ICE_ENDPOINT_I_H
 #define ICE_ENDPOINT_I_H
 
+#include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Thread.h>
 #include <IceUtil/Monitor.h>
@@ -20,15 +21,12 @@
 #include <Ice/ConnectorF.h>
 #include <Ice/AcceptorF.h>
 #include <Ice/Protocol.h>
+#include <Ice/Network.h>
 
-#ifdef _WIN32
-#   include <winsock2.h>
-#else
-#   include <sys/socket.h> // For struct sockaddr_storage
+#ifndef ICE_OS_WINRT
+#   include <deque>
 #endif
 
-#include <deque>
-
 namespace IceInternal
 {
 
@@ -154,8 +152,8 @@ public:
     virtual ::Ice::Int ice_getHash() const;
 
 protected:
-
-    virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const;
+    
+    virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&) const;
     friend class EndpointHostResolver;
 
     EndpointI(const Ice::ProtocolVersion&, const Ice::EncodingVersion&);
@@ -184,7 +182,11 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
+#ifndef ICE_OS_WINRT
 class ICE_API EndpointHostResolver : public IceUtil::Thread, public IceUtil::Monitor<IceUtil::Mutex>
+#else
+class ICE_API EndpointHostResolver : public IceUtil::Shared
+#endif
 {
 public:
 
@@ -197,6 +199,7 @@ public:
 
 private:
 
+#ifndef ICE_OS_WINRT
     struct ResolveEntry
     {
         std::string host;
@@ -208,6 +211,7 @@ private:
     const InstancePtr _instance;
     bool _destroyed;
     std::deque<ResolveEntry> _queue;
+#endif
 };
 
 }
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 48444ebe477..12c796843c4 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -17,7 +17,7 @@ using namespace IceInternal;
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
 
 IceInternal::EventHandler::EventHandler() :
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     _pending(SocketOperationNone),
     _ready(SocketOperationNone),
     _started(SocketOperationNone),
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index 5f015365ec8..da1df3b93a4 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -24,7 +24,7 @@ class EventHandler : virtual public ::IceUtil::Shared
 {
 public:
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     //
     // Called to start a new asynchronous read or write operation.
     //
@@ -57,7 +57,7 @@ protected:
     EventHandler();
     ICE_API virtual ~EventHandler();
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     SocketOperation _ready;
     SocketOperation _pending;
     SocketOperation _started;
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 6753c597353..724a306017f 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -13,12 +13,35 @@
 #include <Ice/Plugin.h>
 #include <Ice/SlicedData.h>
 #include <IceUtil/StringUtil.h>
+#ifdef ICE_OS_WINRT
+#    include <IceUtil/Unicode.h>
+#endif
 #include <iomanip>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace
+{
+
+inline string
+socketErrorToString(int error)
+{
+    if(error == 0)
+    {
+        return "unknown error";
+    }
+#ifdef ICE_OS_WINRT
+    return IceUtil::wstringToString(
+        static_cast<Windows::Networking::Sockets::SocketErrorStatus>(error).ToString()->Data());
+#else
+    return IceUtilInternal::errorToString(error);
+#endif
+}
+
+};
+
 namespace IceInternal
 {
 
@@ -308,15 +331,7 @@ void
 Ice::SocketException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nsocket exception: ";
-    if(error == 0)
-    {
-        out << "unknown error";
-    }
-    else
-    {
-        out << IceUtilInternal::errorToString(error);
-    }
+    out << ":\nsocket exception: " << socketErrorToString(error);
 }
 
 void
@@ -342,14 +357,14 @@ void
 Ice::ConnectFailedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nconnect failed: " << IceUtilInternal::errorToString(error);
+    out << ":\nconnect failed: " << socketErrorToString(error);
 }
 
 void
 Ice::ConnectionRefusedException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nconnection refused: " << IceUtilInternal::errorToString(error);
+    out << ":\nconnection refused: " << socketErrorToString(error);
 }
 
 void
@@ -363,7 +378,7 @@ Ice::ConnectionLostException::ice_print(ostream& out) const
     }
     else
     {
-        out << IceUtilInternal::errorToString(error);
+        out << socketErrorToString(error);
     }
 }
 
@@ -371,7 +386,13 @@ void
 Ice::DNSException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nDNS error: " << errorToStringDNS(error) << "\nhost: " << host;
+    out << ":\nDNS error: ";
+#ifdef ICE_OS_WINRT
+    out << socketErrorToString(error);
+#else
+    out << errorToStringDNS(error);
+#endif
+    out << "\nhost: " << host;
 }
 
 void
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index ce5b2cb7d95..9da2940ff6c 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -37,7 +37,7 @@ private:
     IceUtil::Mutex _mutex;
 };
 
-
+#ifndef ICE_OS_WINRT
 class PerThreadImplicitContext : public ImplicitContextI
 {
 public:
@@ -101,7 +101,7 @@ private:
     size_t _index; // index in all SlotVector
     long _id; // corresponds to owner in the Slot
 };
-
+#endif
 }
 
 
@@ -118,7 +118,13 @@ ImplicitContextI::create(const std::string& kind)
     }
     else if(kind == "PerThread")
     {
+#ifndef ICE_OS_WINRT
         return new PerThreadImplicitContext;
+#else
+        throw InitializationException(__FILE__, __LINE__, 
+                                      "'PerThread' Ice.ImplicitContext isn't supported for WinRT.");
+        return 0; // Keep the compiler happy.
+#endif
     }
     else
     {
@@ -129,7 +135,7 @@ ImplicitContextI::create(const std::string& kind)
     }
 }
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
 void
 ImplicitContextI::cleanupThread()
 {
@@ -253,7 +259,7 @@ SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 //
 // PerThreadImplicitContext implementation
 //
-
+#ifndef ICE_OS_WINRT
 long PerThreadImplicitContext::_nextId;
 PerThreadImplicitContext::IndexInUse* PerThreadImplicitContext::_indexInUse;
 IceUtil::Mutex* PerThreadImplicitContext::_mutex = 0;
@@ -281,11 +287,11 @@ Init init;
 
 }
 
-#ifdef _WIN32
+#   ifdef _WIN32
 DWORD PerThreadImplicitContext::_key;
-#else
+#   else
 pthread_key_t PerThreadImplicitContext::_key;
-#endif
+#   endif
 
 PerThreadImplicitContext::PerThreadImplicitContext()
 {
@@ -297,19 +303,19 @@ PerThreadImplicitContext::PerThreadImplicitContext()
         // Initialize; note that we never dealloc this key (it would be
         // complex, and since it's a static variable, it's not really a leak)
         //
-#ifdef _WIN32
+#   ifdef _WIN32
         _key = TlsAlloc();
         if(_key == TLS_OUT_OF_INDEXES)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
         }
-#else
+#   else
         int err = pthread_key_create(&_key, &threadDestructor);
         if(err != 0)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
         }
-#endif
+#   endif
     }
     
     //
@@ -368,11 +374,11 @@ PerThreadImplicitContext::threadDestructor(void* v)
 Context*
 PerThreadImplicitContext::getThreadContext(bool allocate) const
 {
-#ifdef _WIN32
+#   ifdef _WIN32
     SlotVector* sv = static_cast<SlotVector*>(TlsGetValue(_key));
-#else
+#   else
     SlotVector* sv = static_cast<SlotVector*>(pthread_getspecific(_key));
-#endif
+#   endif
     if(sv == 0)
     {
         if(!allocate)
@@ -381,18 +387,18 @@ PerThreadImplicitContext::getThreadContext(bool allocate) const
         }
 
         sv = new SlotVector(_index + 1);
-#ifdef _WIN32
+#   ifdef _WIN32
 
         if(TlsSetValue(_key, sv) == 0)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
         }
-#else
+#   else
         if(int err = pthread_setspecific(_key, sv))
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
         }
-#endif
+#   endif
     }
     else
     {
@@ -441,11 +447,11 @@ PerThreadImplicitContext::getThreadContext(bool allocate) const
 void
 PerThreadImplicitContext::clearThreadContext() const
 {
-#ifdef _WIN32
+#   ifdef _WIN32
     SlotVector* sv = static_cast<SlotVector*>(TlsGetValue(_key));
-#else
+#   else
     SlotVector* sv = static_cast<SlotVector*>(pthread_getspecific(_key));
-#endif
+#   endif
     if(sv != 0 && _index < sv->size())
     {
         delete (*sv)[_index].context;
@@ -473,17 +479,17 @@ PerThreadImplicitContext::clearThreadContext() const
         if(clear)
         {
             delete sv;
-#ifdef _WIN32
+#   ifdef _WIN32
             if(TlsSetValue(_key, 0) == 0)
             {
                 IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
             }
-#else
+#   else
             if(int err = pthread_setspecific(_key, 0))
             {
                 throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, err);
             }
-#endif
+#   endif
         }
         else
         {
@@ -629,3 +635,4 @@ PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
         ctx.insert(threadCtx->begin(), threadCtx->end());
     }
 }
+#endif
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index fad49fae521..26099f3b815 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -29,8 +29,6 @@
 #include <Ice/Network.h>
 #include <Ice/EndpointFactoryManager.h>
 #include <Ice/RetryQueue.h>
-#include <Ice/TcpEndpointI.h>
-#include <Ice/UdpEndpointI.h>
 #include <Ice/DynamicLibrary.h>
 #include <Ice/PluginManagerI.h>
 #include <Ice/Initialize.h>
@@ -53,6 +51,15 @@
 #   include <sys/types.h>
 #endif
 
+#include <Ice/UdpEndpointI.h>
+
+#ifndef ICE_OS_WINRT
+#   include <Ice/TcpEndpointI.h>
+#else
+#   include <IceSSL/EndpointInfo.h> // For IceSSL::EndpointType
+#   include <Ice/winrt/StreamEndpointI.h>
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -857,7 +864,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             if(instanceCount == 1)
             {                   
                 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
                 WORD version = MAKEWORD(1, 1);
                 WSADATA data;
                 if(WSAStartup(version, &data) != 0)
@@ -943,9 +950,10 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
         //
         const_cast<Int&>(_clientACM) = _initData.properties->getPropertyAsIntWithDefault("Ice.ACM.Client", 60);
         const_cast<Int&>(_serverACM) = _initData.properties->getPropertyAsInt("Ice.ACM.Server");
+#ifndef ICE_OS_WINRT
         const_cast<ImplicitContextIPtr&>(_implicitContext) = 
             ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext"));
-
+#endif
         _routerManager = new RouterManager;
 
         _locatorManager = new LocatorManager(_initData.properties);
@@ -973,8 +981,15 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
             _protocolSupport = EnableIPv6;
         }
         _endpointFactoryManager = new EndpointFactoryManager(this);
+#ifndef ICE_OS_WINRT
         EndpointFactoryPtr tcpEndpointFactory = new TcpEndpointFactory(this);
         _endpointFactoryManager->add(tcpEndpointFactory);
+#else
+        EndpointFactoryPtr tcpStreamEndpointFactory = new StreamEndpointFactory(this, TCPEndpointType);
+        _endpointFactoryManager->add(tcpStreamEndpointFactory);
+        EndpointFactoryPtr sslStreamEndpointFactory = new StreamEndpointFactory(this, IceSSL::EndpointType);
+        _endpointFactoryManager->add(sslStreamEndpointFactory);
+#endif
         EndpointFactoryPtr udpEndpointFactory = new UdpEndpointFactory(this);
         _endpointFactoryManager->add(udpEndpointFactory);
 
@@ -1048,7 +1063,7 @@ IceInternal::Instance::~Instance()
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(staticMutex);
     if(--instanceCount == 0)
     {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
         WSACleanup();
 #endif
         
@@ -1075,7 +1090,6 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     assert(pluginManagerImpl);
     pluginManagerImpl->loadPlugins(argc, argv);
 
-
     //
     // Create threads.
     //
@@ -1098,7 +1112,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
         out << "cannot create thread for timer:\n" << ex;
         throw;
     }
-    
+
     try
     {
         _endpointHostResolver = new EndpointHostResolver(this);
@@ -1109,7 +1123,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
         out << "cannot create thread for endpoint host resolver:\n" << ex;
         throw;
     }
-
+    
     _clientThreadPool = new ThreadPool(this, "Ice.ThreadPool.Client", 0);
 
     //
@@ -1150,7 +1164,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     if(printProcessId)
     {
 #ifdef _MSC_VER
-        cout << _getpid() << endl;
+        cout << GetCurrentProcessId() << endl;
 #else
         cout << getpid() << endl;
 #endif
@@ -1242,7 +1256,6 @@ IceInternal::Instance::destroy()
     ThreadPoolPtr serverThreadPool;
     ThreadPoolPtr clientThreadPool;
     EndpointHostResolverPtr endpointHostResolver;
-
     {
         IceUtil::RecMutex::Lock sync(*this);
 
@@ -1267,7 +1280,6 @@ IceInternal::Instance::destroy()
             _clientThreadPool->destroy();
             std::swap(_clientThreadPool, clientThreadPool);
         }
-
         if(_endpointHostResolver)
         {
             _endpointHostResolver->destroy();
@@ -1319,7 +1331,7 @@ IceInternal::Instance::destroy()
         // No destroy function defined.
         // _dynamicLibraryList->destroy();
         _dynamicLibraryList = 0;
-        
+
         _adminAdapter = 0;
         _adminFacets.clear();
 
@@ -1337,11 +1349,13 @@ IceInternal::Instance::destroy()
     {
         serverThreadPool->joinWithAllThreads();
     }
+#ifndef ICE_OS_WINRT
     if(endpointHostResolver)
     {
         endpointHostResolver->getThreadControl().join();
     }
-
+#endif
+    
     if(_initData.properties->getPropertyAsInt("Ice.Warn.UnusedProperties") > 0)
     {
         set<string> unusedProperties = static_cast<PropertiesI*>(_initData.properties.get())->getUnusedProperties();
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index 6d498dc6715..b39e88ce838 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -10,6 +10,7 @@
 #ifndef ICE_INSTANCE_H
 #define ICE_INSTANCE_H
 
+#include <IceUtil/Config.h>
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
 #include <IceUtil/RecMutex.h>
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp
index 28a380779a8..ed730a8bb88 100644
--- a/cpp/src/Ice/Network.cpp
+++ b/cpp/src/Ice/Network.cpp
@@ -21,25 +21,28 @@
 // The following is required for the Vista PSDK to bring in
 // the definitions of the IN6_IS_ADDR_* macros.
 //
-#if defined(_WIN32) && !defined(_WIN32_WINNT)
+#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02
 #       define _WIN32_WINNT 0x0501
 #endif
 
+#include <Ice/Network.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Unicode.h>
-#include <Ice/Network.h>
 #include <Ice/LocalException.h>
 #include <Ice/Properties.h> // For setTcpBufSize
 #include <Ice/LoggerUtil.h> // For setTcpBufSize
 
-#if defined(_WIN32)
-#  include <winsock2.h>
-#  include <ws2tcpip.h>
-#  include <iphlpapi.h>
-#  include <Mswsock.h>
+#if defined(ICE_OS_WINRT)
+#   include <IceUtil/InputUtil.h>
+#   include <ppltasks.h>            // For Concurrency::task
+#elif defined(_WIN32) 
+#   include <winsock2.h>
+#   include <ws2tcpip.h>
+#   include <iphlpapi.h>
+#   include <Mswsock.h>
 #else
-#  include <net/if.h>
-#  include <sys/ioctl.h>
+#   include <net/if.h>
+#   include <sys/ioctl.h>
 #endif
 
 #if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
@@ -52,6 +55,14 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifdef ICE_OS_WINRT
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+#endif
+
 #if defined(__sun) && !defined(__GNUC__)
 #    define INADDR_NONE (in_addr_t)0xffffffff
 #endif
@@ -59,10 +70,195 @@ using namespace IceInternal;
 namespace
 {
 
-vector<struct sockaddr_storage>
+#ifndef ICE_OS_WINRT
+void
+setTcpNoDelay(SOCKET fd)
+{
+    int flag = 1;
+    if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR)
+    {
+        closeSocketNoThrow(fd);
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
+}
+
+void
+setKeepAlive(SOCKET fd)
+{
+    int flag = 1;
+    if(setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR)
+    {
+        closeSocketNoThrow(fd);
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
+}
+#endif
+
+SOCKET
+createSocketImpl(bool udp, int family)
+{
+#ifdef ICE_OS_WINRT
+    if(udp)
+    {
+        return ref new DatagramSocket();
+    }
+    else
+    {
+        StreamSocket^ socket = ref new StreamSocket();
+        socket->Control->KeepAlive = true;
+        socket->Control->NoDelay = true;
+        return socket;
+    }
+#else
+    SOCKET fd;
+
+    if(udp)
+    {
+        fd = socket(family, SOCK_DGRAM, IPPROTO_UDP);
+    }
+    else
+    {
+        fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
+    }
+
+    if(fd == INVALID_SOCKET)
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
+
+    if(!udp)
+    {
+        setTcpNoDelay(fd);
+        setKeepAlive(fd);
+    }
+
+    return fd;
+#endif
+}
+
+Address
+getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool server)
+{
+    Address addr;
+#ifdef ICE_OS_WINRT
+    ostringstream os;
+    os << port;
+    addr.port = ref new String(IceUtil::stringToWstring(os.str()).c_str());
+    if(host.empty())
+    {
+        if(server)
+        {
+            addr.host = nullptr; // Equivalent of inaddr_any, see doBind implementation.
+        }
+        else
+        {
+            addr.host = ref new HostName("localhost");
+        }
+    }
+    else
+    {
+        addr.host = ref new HostName(ref new String(IceUtil::stringToWstring(host).c_str()));
+    }
+#else
+    memset(&addr, 0, sizeof(Address));
+
+    //
+    // We don't use getaddrinfo when host is empty as it's not portable (some old Linux
+    // versions don't support it).
+    //
+    if(host.empty())
+    {
+        if(protocol == EnableIPv6)
+        {
+            sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
+            addrin6->sin6_family = AF_INET6;
+            addrin6->sin6_port = htons(port);
+            addrin6->sin6_addr = server ? in6addr_any : in6addr_loopback;
+        }
+        else
+        {
+            sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
+            addrin->sin_family = AF_INET;
+            addrin->sin_port = htons(port);
+            addrin->sin_addr.s_addr = server ? htonl(INADDR_ANY) : htonl(INADDR_LOOPBACK);
+        }
+        return addr;
+    }
+
+    struct addrinfo* info = 0;
+    int retry = 5;
+
+    struct addrinfo hints = { 0 };
+
+    if(server)
+    {
+        //
+        // If host is empty, getaddrinfo will return the wildcard
+        // address instead of the loopack address.
+        //
+        hints.ai_flags |= AI_PASSIVE;
+    }
+
+    if(protocol == EnableIPv4)
+    {
+        hints.ai_family = PF_INET;
+    }
+    else if(protocol == EnableIPv6)
+    {
+        hints.ai_family = PF_INET6;
+    }
+    else
+    {
+        hints.ai_family = PF_UNSPEC;
+    }
+
+    int rs = 0;
+    do
+    {
+        rs = getaddrinfo(host.c_str(), 0, &hints, &info);
+    }
+    while(info == 0 && rs == EAI_AGAIN && --retry >= 0);
+
+    if(rs != 0)
+    {
+        DNSException ex(__FILE__, __LINE__);
+        ex.error = rs;
+        ex.host = host;
+        throw ex;
+    }
+
+    memcpy(&addr, info->ai_addr, info->ai_addrlen);
+    if(info->ai_family == PF_INET)
+    {
+        reinterpret_cast<sockaddr_in*>(&addr)->sin_port = htons(port);
+    }
+    else if(info->ai_family == PF_INET6)
+    {
+        reinterpret_cast<sockaddr_in6*>(&addr)->sin6_port = htons(port);
+    }
+    else // Unknown address family.
+    {
+        freeaddrinfo(info);
+        DNSException ex(__FILE__, __LINE__);
+        ex.host = host;
+        throw ex;
+    }
+    freeaddrinfo(info);
+#endif
+    return addr;
+}
+
+#ifndef ICE_OS_WINRT
+vector<Address>
 getLocalAddresses(ProtocolSupport protocol)
 {
-    vector<struct sockaddr_storage> result;
+    vector<Address> result;
 
 #if defined(_WIN32)
     try
@@ -74,7 +270,7 @@ getLocalAddresses(ProtocolSupport protocol)
                 continue;
             }
 
-            SOCKET fd = createSocket(false, i == 0 ? AF_INET : AF_INET6);
+            SOCKET fd = createSocketImpl(false, i == 0 ? AF_INET : AF_INET6);
 
             vector<unsigned char> buffer;
             buffer.resize(1024);
@@ -111,7 +307,7 @@ getLocalAddresses(ProtocolSupport protocol)
             SOCKET_ADDRESS_LIST* addrs = reinterpret_cast<SOCKET_ADDRESS_LIST*>(&buffer[0]);
             for (int i = 0; i < addrs->iAddressCount; ++i)
             {
-                sockaddr_storage addr;
+                Address addr;
                 memcpy(&addr, addrs->Address[i].lpSockaddr, addrs->Address[i].iSockaddrLength);
                 if(addr.ss_family == AF_INET && protocol != EnableIPv6)
                 {
@@ -155,7 +351,7 @@ getLocalAddresses(ProtocolSupport protocol)
         {
             if(curr->ifa_addr->sa_family == AF_INET && protocol != EnableIPv6)
             {
-                sockaddr_storage addr;
+                Address addr;
                 memcpy(&addr, curr->ifa_addr, sizeof(sockaddr_in));
                 if(reinterpret_cast<struct sockaddr_in*>(&addr)->sin_addr.s_addr != 0)
                 {
@@ -164,11 +360,11 @@ getLocalAddresses(ProtocolSupport protocol)
             }
             else if(curr->ifa_addr->sa_family == AF_INET6 && protocol != EnableIPv4)
             {
-                sockaddr_storage addr;
+                Address addr;
                 memcpy(&addr, curr->ifa_addr, sizeof(sockaddr_in6));
                 if(!IN6_IS_ADDR_UNSPECIFIED(&reinterpret_cast<struct sockaddr_in6*>(&addr)->sin6_addr))
                 {
-                    result.push_back(*reinterpret_cast<struct sockaddr_storage*>(curr->ifa_addr));
+                    result.push_back(*reinterpret_cast<Address*>(curr->ifa_addr));
                 }
             }
         }
@@ -184,7 +380,7 @@ getLocalAddresses(ProtocolSupport protocol)
         {
             continue;
         }
-        SOCKET fd = createSocket(false, i == 0 ? AF_INET : AF_INET6);
+        SOCKET fd = createSocketImpl(false, i == 0 ? AF_INET : AF_INET6);
 
 #ifdef _AIX
         int cmd = CSIOCGIFCONF;
@@ -239,51 +435,51 @@ getLocalAddresses(ProtocolSupport protocol)
         {
             if(!(ifr[i].ifr_flags & IFF_LOOPBACK)) // Don't include loopback interface addresses
             {
-		//
-		// On Solaris the above Loopback check does not always work so we double 
-		// check the address below. Solaris also returns duplicate entries that need
-		// to be filtered out.
-		//
+                //
+                // On Solaris the above Loopback check does not always work so we double 
+                // check the address below. Solaris also returns duplicate entries that need
+                // to be filtered out.
+                //
                 if(ifr[i].ifr_addr.sa_family == AF_INET && protocol != EnableIPv6)
                 {
-                    sockaddr_storage addr;
+                    Address addr;
                     memcpy(&addr, &ifr[i].ifr_addr, sizeof(sockaddr_in));
                     struct in_addr* inaddr = &reinterpret_cast<struct sockaddr_in*>(&addr)->sin_addr;
                     if(inaddr->s_addr != 0 && inaddr->s_addr != htonl(INADDR_LOOPBACK))
                     {
-			unsigned int j;
-			for(j = 0; j < result.size(); ++j)
-			{
-			   if(compareAddress(addr, result[j]) == 0)
-			   {
-			       break;
-			   }
-			}
-			if(j == result.size())
-			{
+                        unsigned int j;
+                        for(j = 0; j < result.size(); ++j)
+                        {
+                            if(compareAddress(addr, result[j]) == 0)
+                            {
+                                break;
+                            }
+                        }
+                        if(j == result.size())
+                        {
                             result.push_back(addr);
-			}
+                        }
                     }
                 }
                 else if(ifr[i].ifr_addr.sa_family == AF_INET6 && protocol != EnableIPv4)
                 {
-                    sockaddr_storage addr;
+                    Address addr;
                     memcpy(&addr, &ifr[i].ifr_addr, sizeof(sockaddr_in6));
                     struct in6_addr* inaddr6 = &reinterpret_cast<struct sockaddr_in6*>(&addr)->sin6_addr;
                     if(!IN6_IS_ADDR_UNSPECIFIED(inaddr6) && !IN6_IS_ADDR_LOOPBACK(inaddr6))
                     {
-			unsigned int j;
-			for(j = 0; j < result.size(); ++j)
-			{
-			   if(compareAddress(addr, result[j]) == 0)
-			   {
-			       break;
-			   }
-			}
-			if(j == result.size())
-			{
+                        unsigned int j;
+                        for(j = 0; j < result.size(); ++j)
+                        {
+                            if(compareAddress(addr, result[j]) == 0)
+                            {
+                                break;
+                            }
+                        }
+                        if(j == result.size())
+                        {
                             result.push_back(addr);
-			}
+                        }
                     }
                 }
             }
@@ -295,103 +491,12 @@ getLocalAddresses(ProtocolSupport protocol)
     return result;
 }
 
-struct sockaddr_storage
-getAddressImpl(const string& host, int port, ProtocolSupport protocol, bool server)
-{
-    struct sockaddr_storage addr;
-    memset(&addr, 0, sizeof(struct sockaddr_storage));
-
-    //
-    // We don't use getaddrinfo when host is empty as it's not portable (some old Linux
-    // versions don't support it).
-    //
-    if(host.empty())
-    {
-        if(protocol == EnableIPv6)
-        {
-            sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
-            addrin6->sin6_family = AF_INET6;
-            addrin6->sin6_port = htons(port);
-            addrin6->sin6_addr = server ? in6addr_any : in6addr_loopback;
-        }
-        else
-        {
-            sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
-            addrin->sin_family = AF_INET;
-            addrin->sin_port = htons(port);
-            addrin->sin_addr.s_addr = server ? htonl(INADDR_ANY) : htonl(INADDR_LOOPBACK);
-        }
-        return addr;
-    }
-
-    struct addrinfo* info = 0;
-    int retry = 5;
-
-    struct addrinfo hints = { 0 };
-
-    if(server)
-    {
-        //
-        // If host is empty, getaddrinfo will return the wildcard
-        // address instead of the loopack address.
-        //
-        hints.ai_flags |= AI_PASSIVE;
-    }
-
-    if(protocol == EnableIPv4)
-    {
-        hints.ai_family = PF_INET;
-    }
-    else if(protocol == EnableIPv6)
-    {
-        hints.ai_family = PF_INET6;
-    }
-    else
-    {
-        hints.ai_family = PF_UNSPEC;
-    }
-
-    int rs = 0;
-    do
-    {
-        rs = getaddrinfo(host.c_str(), 0, &hints, &info);
-    }
-    while(info == 0 && rs == EAI_AGAIN && --retry >= 0);
-
-    if(rs != 0)
-    {
-        DNSException ex(__FILE__, __LINE__);
-        ex.error = rs;
-        ex.host = host;
-        throw ex;
-    }
-
-    memcpy(&addr, info->ai_addr, info->ai_addrlen);
-    if(info->ai_family == PF_INET)
-    {
-        reinterpret_cast<sockaddr_in*>(&addr)->sin_port = htons(port);
-    }
-    else if(info->ai_family == PF_INET6)
-    {
-        reinterpret_cast<sockaddr_in6*>(&addr)->sin6_port = htons(port);
-    }
-    else // Unknown address family.
-    {
-        freeaddrinfo(info);
-        DNSException ex(__FILE__, __LINE__);
-        ex.host = host;
-        throw ex;
-    }
-    freeaddrinfo(info);
-    return addr;
-}
-
 bool
 isWildcard(const string& host, ProtocolSupport protocol)
 {
     try
     {
-        sockaddr_storage addr = getAddressImpl(host, 0, protocol, false);
+        Address addr = getAddressImpl(host, 0, protocol, false);
         if(addr.ss_family == AF_INET)
         {
             struct sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
@@ -481,7 +586,7 @@ getInterfaceAddress(const string& name)
     ifreq if_address;
     strcpy(if_address.ifr_name, name.c_str());
 
-    SOCKET fd = createSocket(false, AF_INET);
+    SOCKET fd = createSocketImpl(false, AF_INET);
     int rc = ioctl(fd, SIOCGIFADDR, &if_address);
     closeSocketNoThrow(fd);
 
@@ -494,6 +599,8 @@ getInterfaceAddress(const string& name)
     return addr;
 }
 
+#endif // #ifndef ICE_OS_WINRT
+
 }
 
 #ifdef ICE_USE_IOCP
@@ -504,317 +611,691 @@ IceInternal::AsyncInfo::AsyncInfo(SocketOperation s)
 }
 #endif
 
-int
-IceInternal::getSocketErrno()
+bool
+IceInternal::noMoreFds(int error)
 {
-#ifdef _WIN32
-    return WSAGetLastError();
+#if defined(ICE_OS_WINRT)
+    return error == (int)SocketErrorStatus::TooManyOpenFiles; 
+#elif defined(_WIN32)
+    return error == WSAEMFILE;
 #else
-    return errno;
+    return error == EMFILE || error == ENFILE;
 #endif
 }
 
-bool
-IceInternal::interrupted()
+string
+IceInternal::errorToStringDNS(int error)
 {
-#ifdef _WIN32
-    return WSAGetLastError() == WSAEINTR;
+#if defined(ICE_OS_WINRT)
+    return "Host not found";
+#elif defined(_WIN32)
+    return IceUtilInternal::errorToString(error);
 #else
-#   ifdef EPROTO
-    return errno == EINTR || errno == EPROTO;
-#   else
-    return errno == EINTR;
-#   endif
+    return gai_strerror(error);
 #endif
 }
 
-bool
-IceInternal::acceptInterrupted()
+vector<Address>
+IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol, bool blocking)
 {
-    if(interrupted())
+    vector<Address> result;
+    Address addr;
+#ifdef ICE_OS_WINRT
+    addr.host = ref new HostName(host.empty() ? "localhost" : ref new String(IceUtil::stringToWstring(host).c_str()));
+    stringstream os;
+    os << port;
+    addr.port = ref new String(IceUtil::stringToWstring(os.str()).c_str());
+    result.push_back(addr);
+#else
+    memset(&addr, 0, sizeof(Address));
+
+    //
+    // We don't use getaddrinfo when host is empty as it's not portable (some old Linux
+    // versions don't support it).
+    //
+    if(host.empty())
     {
-        return true;
+        if(protocol != EnableIPv4)
+        {
+            sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
+            addrin6->sin6_family = AF_INET6;
+            addrin6->sin6_port = htons(port);
+            addrin6->sin6_addr = in6addr_loopback;
+            result.push_back(addr);
+        }
+        if(protocol != EnableIPv6)
+        {
+            sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
+            addrin->sin_family = AF_INET;
+            addrin->sin_port = htons(port);
+            addrin->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+            result.push_back(addr);
+        }
+        return result;
     }
 
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    return error == WSAECONNABORTED ||
-           error == WSAECONNRESET ||
-           error == WSAETIMEDOUT;
+    struct addrinfo* info = 0;
+    int retry = 5;
+
+    struct addrinfo hints = { 0 };
+    if(protocol == EnableIPv4)
+    {
+        hints.ai_family = PF_INET;
+    }
+    else if(protocol == EnableIPv6)
+    {
+        hints.ai_family = PF_INET6;
+    }
+    else
+    {
+        hints.ai_family = PF_UNSPEC;
+    }
+
+    if(!blocking)
+    {
+        hints.ai_flags = AI_NUMERICHOST;
+    }
+
+    int rs = 0;
+    do
+    {
+        rs = getaddrinfo(host.c_str(), 0, &hints, &info);
+    }
+    while(info == 0 && rs == EAI_AGAIN && --retry >= 0);
+
+    // In theory, getaddrinfo should only return EAI_NONAME if AI_NUMERICHOST is specified and the host name
+    // is not a IP address. However on some platforms (e.g. Mac OS X 10.4.x) EAI_NODATA is also returned so 
+    // we also check for it.
+#ifdef EAI_NODATA
+    if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA))
 #else
-    return errno == ECONNABORTED ||
-           errno == ECONNRESET ||
-           errno == ETIMEDOUT;
+    if(!blocking && rs == EAI_NONAME)
+#endif
+    {
+        return result; // Empty result indicates that a blocking lookup is necessary.
+    }
+    else if(rs != 0)
+    {
+        DNSException ex(__FILE__, __LINE__);
+        ex.error = rs;
+        ex.host = host;
+        throw ex;
+    }
+
+    struct addrinfo* p;
+    for(p = info; p != NULL; p = p->ai_next)
+    {
+        memcpy(&addr, p->ai_addr, p->ai_addrlen);
+        if(p->ai_family == PF_INET)
+        {
+            struct sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
+            addrin->sin_port = htons(port);
+        }
+        else if(p->ai_family == PF_INET6)
+        {
+            struct sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
+            addrin6->sin6_port = htons(port);
+        }
+
+        bool found = false;
+        for(unsigned int i = 0; i < result.size(); ++i)
+        {
+            if(compareAddress(result[i], addr) == 0)
+            {
+                found = true;
+                break;
+            }
+        }
+        if(!found)
+        {
+            result.push_back(addr);
+        }
+    }
+
+    freeaddrinfo(info);
+
+    if(result.size() == 0)
+    {
+        DNSException ex(__FILE__, __LINE__);
+        ex.host = host;
+        throw ex;
+    }
 #endif
+    return result;
 }
 
-bool
-IceInternal::noBuffers()
+ProtocolSupport
+IceInternal::getProtocolSupport(const Address& addr)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    return error == WSAENOBUFS ||
-           error == WSAEFAULT;
+#ifndef ICE_OS_WINRT
+    return addr.ss_family == AF_INET ? EnableIPv4 : EnableIPv6;
 #else
-    return errno == ENOBUFS;
+    return EnableIPv4;
 #endif
 }
 
-bool
-IceInternal::wouldBlock()
+Address
+IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport protocol)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING || error == ERROR_IO_PENDING;
+    return getAddressImpl(host, port, protocol, true);
+}
+
+Address
+IceInternal::getAddress(const string& host, int port, ProtocolSupport protocol)
+{
+    return getAddressImpl(host, port, protocol, false);
+}
+
+int
+IceInternal::compareAddress(const Address& addr1, const Address& addr2)
+{
+#ifdef ICE_OS_WINRT
+    int o = String::CompareOrdinal(addr1.port, addr2.port);
+    if(o != 0)
+    {
+        return o;
+    }
+    return String::CompareOrdinal(addr1.host->RawName, addr2.host->RawName);
 #else
-    return errno == EAGAIN || errno == EWOULDBLOCK;
+    if(addr1.ss_family < addr2.ss_family)
+    {
+        return -1;
+    }
+    else if(addr2.ss_family < addr1.ss_family)
+    {
+        return 1;
+    }
+
+    if(addr1.ss_family == AF_INET)
+    {
+        const struct sockaddr_in* addr1in = reinterpret_cast<const sockaddr_in*>(&addr1);
+        const struct sockaddr_in* addr2in = reinterpret_cast<const sockaddr_in*>(&addr2);
+
+        if(addr1in->sin_port < addr2in->sin_port)
+        {
+            return -1;
+        }
+        else if(addr2in->sin_port < addr1in->sin_port)
+        {
+            return 1;
+        }
+
+        if(addr1in->sin_addr.s_addr < addr2in->sin_addr.s_addr)
+        {
+            return -1;
+        }
+        else if(addr2in->sin_addr.s_addr < addr1in->sin_addr.s_addr)
+        {
+            return 1;
+        }
+    }
+    else
+    {
+        const struct sockaddr_in6* addr1in = reinterpret_cast<const sockaddr_in6*>(&addr1);
+        const struct sockaddr_in6* addr2in = reinterpret_cast<const sockaddr_in6*>(&addr2);
+
+        if(addr1in->sin6_port < addr2in->sin6_port)
+        {
+            return -1;
+        }
+        else if(addr2in->sin6_port < addr1in->sin6_port)
+        {
+            return 1;
+        }
+
+        int res = memcmp(&addr1in->sin6_addr, &addr2in->sin6_addr, sizeof(struct in6_addr));
+        if(res < 0)
+        {
+            return -1;
+        }
+        else if(res > 0)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
 #endif
 }
 
-bool
-IceInternal::connectFailed()
+SOCKET
+IceInternal::createSocket(bool udp, const Address& addr)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    return error == WSAECONNREFUSED ||
-           error == WSAETIMEDOUT ||
-           error == WSAENETUNREACH ||
-           error == WSAEHOSTUNREACH ||
-           error == WSAECONNRESET ||
-           error == WSAESHUTDOWN ||
-           error == WSAECONNABORTED;
+#ifdef ICE_OS_WINRT
+    return createSocketImpl(udp, 0);
 #else
-    return errno == ECONNREFUSED ||
-           errno == ETIMEDOUT ||
-           errno == ENETUNREACH ||
-           errno == EHOSTUNREACH ||
-           errno == ECONNRESET ||
-           errno == ESHUTDOWN ||
-           errno == ECONNABORTED;
+    return createSocketImpl(udp, addr.ss_family);
 #endif
 }
 
-bool
-IceInternal::connectionRefused()
+
+void
+IceInternal::closeSocketNoThrow(SOCKET fd)
 {
-#ifdef _WIN32
+#if defined(ICE_OS_WINRT)
+    //
+    // NOTE: StreamSocket::Close or DatagramSocket::Close aren't
+    // exposed in C++, you have to delete the socket to close
+    // it. According some Microsoft samples, this is safe even if
+    // there are still references to the object...
+    //
+    //fd->Close();
+    delete fd;
+#elif defined(_WIN32)
     int error = WSAGetLastError();
-    return error == WSAECONNREFUSED || error == ERROR_CONNECTION_REFUSED;
+    closesocket(fd);
+    WSASetLastError(error);
 #else
-    return errno == ECONNREFUSED;
+    int error = errno;
+    close(fd);
+    errno = error;
 #endif
 }
 
-bool
-IceInternal::connectInProgress()
+void
+IceInternal::closeSocket(SOCKET fd)
 {
-#ifdef _WIN32
+#if defined(ICE_OS_WINRT)
+    //
+    // NOTE: StreamSocket::Close or DatagramSocket::Close aren't
+    // exposed in C++, you have to delete the socket to close
+    // it. According some Microsoft samples, this is safe even if
+    // there are still references to the object...
+    //
+    //fd->Close();
+    delete fd;
+#elif defined(_WIN32)
     int error = WSAGetLastError();
-    return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING || error == ERROR_IO_PENDING;
+    if(closesocket(fd) == SOCKET_ERROR)
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
+    WSASetLastError(error);
 #else
-    return errno == EINPROGRESS;
+    int error = errno;
+    if(close(fd) == SOCKET_ERROR)
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
+    errno = error;
 #endif
 }
 
-bool
-IceInternal::connectionLost()
+string
+IceInternal::addrToString(const Address& addr)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    return error == WSAECONNRESET ||
-           error == WSAESHUTDOWN ||
-           error == WSAENOTCONN ||
-#ifdef ICE_USE_IOCP
-           error == ERROR_NETNAME_DELETED ||
-#endif
-           error == WSAECONNABORTED;
+    ostringstream s;
+    s << inetAddrToString(addr) << ':' << getPort(addr);
+    return s.str();
+}
+
+void
+IceInternal::fdToLocalAddress(SOCKET fd, Address& addr)
+{
+#ifndef ICE_OS_WINRT
+    socklen_t len = static_cast<socklen_t>(sizeof(Address));
+    if(getsockname(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
+    {
+        closeSocketNoThrow(fd);
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }
 #else
-    return errno == ECONNRESET ||
-           errno == ENOTCONN ||
-           errno == ESHUTDOWN ||
-           errno == ECONNABORTED ||
-           errno == EPIPE;
+    StreamSocket^ stream = dynamic_cast<StreamSocket^>(fd);
+    if(stream)
+    {
+        addr.host = stream->Information->LocalAddress;
+        addr.port = stream->Information->LocalPort;
+    }
+    DatagramSocket^ datagram = dynamic_cast<DatagramSocket^>(fd);
+    if(datagram)
+    {
+        addr.host = datagram->Information->LocalAddress;
+        addr.port = datagram->Information->LocalPort;
+    }
 #endif
 }
 
 bool
-IceInternal::notConnected()
+IceInternal::fdToRemoteAddress(SOCKET fd, Address& addr)
 {
-#ifdef _WIN32
-    return WSAGetLastError() == WSAENOTCONN;
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-    return errno == ENOTCONN || errno == EINVAL;
+#ifndef ICE_OS_WINRT
+    socklen_t len = static_cast<socklen_t>(sizeof(Address));
+    if(getpeername(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
+    {
+        if(notConnected())
+        {
+            return false;
+        }
+        else
+        {
+            closeSocketNoThrow(fd);
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+    }
+
+    return true;
 #else
-    return errno == ENOTCONN;
+    StreamSocket^ stream = dynamic_cast<StreamSocket^>(fd);
+    if(stream != nullptr)
+    {
+        addr.host = stream->Information->RemoteAddress;
+        addr.port = stream->Information->RemotePort;
+    }
+    DatagramSocket^ datagram = dynamic_cast<DatagramSocket^>(fd);
+    if(datagram != nullptr)
+    {
+        addr.host = datagram->Information->RemoteAddress;
+        addr.port = datagram->Information->RemotePort;
+    }
+    return addr.host != nullptr;
 #endif
 }
 
+
+std::string
+IceInternal::fdToString(SOCKET fd)
+{
+    if(fd == INVALID_SOCKET)
+    {
+        return "<closed>";
+    }
+
+    Address localAddr;
+    fdToLocalAddress(fd, localAddr);
+
+    Address remoteAddr;
+    bool peerConnected = fdToRemoteAddress(fd, remoteAddr);
+
+    return addressesToString(localAddr, remoteAddr, peerConnected);
+};
+
+void
+IceInternal::fdToAddressAndPort(SOCKET fd, string& localAddress, int& localPort, string& remoteAddress, int& remotePort)
+{
+    if(fd == INVALID_SOCKET)
+    {
+        localAddress.clear();
+        remoteAddress.clear();
+        localPort = -1;
+        remotePort = -1;
+        return;
+    }
+
+    Address localAddr;
+    fdToLocalAddress(fd, localAddr);
+    addrToAddressAndPort(localAddr, localAddress, localPort);
+
+    Address remoteAddr;
+    if(fdToRemoteAddress(fd, remoteAddr))
+    {
+        addrToAddressAndPort(remoteAddr, remoteAddress, remotePort);
+    }
+    else
+    {
+        remoteAddress.clear();
+        remotePort = -1;
+    }
+}
+
+void
+IceInternal::addrToAddressAndPort(const Address& addr, string& address, int& port)
+{
+    address = inetAddrToString(addr);
+    port = getPort(addr);
+}
+
+std::string
+IceInternal::addressesToString(const Address& localAddr, const Address& remoteAddr,
+                               bool peerConnected)
+{
+    ostringstream s;
+    s << "local address = " << addrToString(localAddr);
+    if(peerConnected)
+    {
+        s << "\nremote address = " << addrToString(remoteAddr);
+    }
+    else
+    {
+        s << "\nremote address = <not connected>";
+    }
+    return s.str();
+}
+
 bool
-IceInternal::recvTruncated()
+IceInternal::isAddressValid(const Address& addr)
 {
-#ifdef _WIN32
-    int err = WSAGetLastError();
-    return  err == WSAEMSGSIZE || err == ERROR_MORE_DATA;
+#ifndef ICE_OS_WINRT
+    return addr.ss_family != AF_UNSPEC;
 #else
-    // We don't get an error under Linux if a datagram is truncated.
-    return false;
+    return addr.host != nullptr || addr.port != nullptr;
 #endif
 }
 
-bool
-IceInternal::noMoreFds(int error)
+vector<string>
+IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport protocolSupport, bool includeLoopback)
 {
-#ifdef _WIN32
-    return error == WSAEMFILE;
+    vector<string> hosts;
+
+#ifndef ICE_OS_WINRT
+    if(host.empty() || isWildcard(host, protocolSupport))
+    {
+        vector<Address> addrs = getLocalAddresses(protocolSupport);
+        for(vector<Address>::const_iterator p = addrs.begin(); p != addrs.end(); ++p)
+        {
+            //
+            // NOTE: We don't publish link-local IPv6 addresses as these addresses can only
+            // be accessed in general with a scope-id.
+            //
+            if(p->ss_family != AF_INET6 ||
+               !IN6_IS_ADDR_LINKLOCAL(&reinterpret_cast<const struct sockaddr_in6*>(&(*p))->sin6_addr))
+            {
+                hosts.push_back(inetAddrToString(*p));
+            }
+        }
+
+        if(hosts.empty() || includeLoopback)
+        {
+            if(protocolSupport != EnableIPv6)
+            {
+                hosts.push_back("127.0.0.1");
+            }
+            if(protocolSupport != EnableIPv4)
+            {
+                hosts.push_back("0:0:0:0:0:0:0:1");
+            }
+        }
+    }
 #else
-    return error == EMFILE || error == ENFILE;
+    //
+    // No support for expanding wildcard addresses on WinRT
+    //
 #endif
+    return hosts; // An empty host list indicates to just use the given host.
 }
 
-SOCKET
-IceInternal::createSocket(bool udp, int family)
+string
+IceInternal::inetAddrToString(const Address& ss)
 {
-    SOCKET fd;
-
-    if(udp)
+#ifndef ICE_OS_WINRT
+    int size = 0;
+    if(ss.ss_family == AF_INET)
     {
-        fd = socket(family, SOCK_DGRAM, IPPROTO_UDP);
+        size = sizeof(sockaddr_in);
+    }
+    else if(ss.ss_family == AF_INET6)
+    {
+        size = sizeof(sockaddr_in6);
     }
     else
     {
-        fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
+        return "";
     }
 
-    if(fd == INVALID_SOCKET)
+    char namebuf[1024];
+    namebuf[0] = '\0';
+    getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, sizeof(namebuf), 0, 0, NI_NUMERICHOST);
+    return string(namebuf);
+#else
+    if(ss.host == nullptr)
     {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        return "";
     }
-
-    if(!udp)
+    else
     {
-        setTcpNoDelay(fd);
-        setKeepAlive(fd);
+        return IceUtil::wstringToString(ss.host->RawName->Data());
     }
-
-    return fd;
+#endif
 }
 
-void
-IceInternal::closeSocket(SOCKET fd)
+int
+IceInternal::getPort(const Address& addr)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    if(closesocket(fd) == SOCKET_ERROR)
+#ifndef ICE_OS_WINRT
+    if(addr.ss_family == AF_INET)
     {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        return ntohs(reinterpret_cast<const sockaddr_in*>(&addr)->sin_port);
+    }
+    else if(addr.ss_family == AF_INET6)
+    {
+        return ntohs(reinterpret_cast<const sockaddr_in6*>(&addr)->sin6_port);
+    }
+    else
+    {
+        return -1;
     }
-    WSASetLastError(error);
 #else
-    int error = errno;
-    if(close(fd) == SOCKET_ERROR)
+    IceUtil::Int64 port;
+    if(addr.port == nullptr || !IceUtilInternal::stringToInt64(IceUtil::wstringToString(addr.port->Data()), port))
     {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        return -1;
     }
-    errno = error;
+    return static_cast<int>(port);
 #endif
 }
 
 void
-IceInternal::closeSocketNoThrow(SOCKET fd)
+IceInternal::setPort(Address& addr, int port)
 {
-#ifdef _WIN32
-    int error = WSAGetLastError();
-    closesocket(fd);
-    WSASetLastError(error);
+#ifndef ICE_OS_WINRT
+    if(addr.ss_family == AF_INET)
+    {
+        reinterpret_cast<sockaddr_in*>(&addr)->sin_port = htons(port);
+    }
+    else
+    {
+        assert(addr.ss_family == AF_INET6);
+        reinterpret_cast<sockaddr_in6*>(&addr)->sin6_port = htons(port);
+    }
 #else
-    int error = errno;
-    close(fd);
-    errno = error;
+    ostringstream os;
+    os << port;
+    addr.port = ref new String(IceUtil::stringToWstring(os.str()).c_str());
 #endif
 }
 
-void
-IceInternal::shutdownSocketWrite(SOCKET fd)
+bool
+IceInternal::isMulticast(const Address& addr)
 {
-    if(shutdown(fd, SHUT_WR) == SOCKET_ERROR)
+#ifndef ICE_OS_WINRT
+    if(addr.ss_family == AF_INET)
     {
-        //
-        // Ignore errors indicating that we are shutdown already.
-        //
-#if defined(_WIN32)
-        int error = WSAGetLastError();
-        //
-        // Under Vista its possible to get a WSAECONNRESET. See
-        // http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1739 for
-        // some details.
-        //
-        if(error == WSAENOTCONN || error == WSAECONNRESET)
-        {
-            return;
-        }
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-        if(errno == ENOTCONN || errno == EINVAL)
-        {
-            return;
-        }
+        return IN_MULTICAST(ntohl(reinterpret_cast<const struct sockaddr_in*>(&addr)->sin_addr.s_addr));
+    }
+    else if(addr.ss_family == AF_INET6)
+    {
+        return IN6_IS_ADDR_MULTICAST(&reinterpret_cast<const struct sockaddr_in6*>(&addr)->sin6_addr);
+    }
 #else
-        if(errno == ENOTCONN)
+    if(addr.host == nullptr)
+    {
+        return false;
+    }
+    string host = IceUtil::wstringToString(addr.host->RawName->Data());
+    string ip = IceUtilInternal::toUpper(host);
+    vector<string> tokens;
+    IceUtilInternal::splitString(ip, ".", tokens);
+    if(tokens.size() == 4)
+    {
+        IceUtil::Int64 j;
+        if(IceUtilInternal::stringToInt64(tokens[0], j))
         {
-            return;
+            if(j >= 233 && j <= 239)
+            {
+                return true;
+            }
         }
-#endif
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
     }
+    if(ip.find("::") != string::npos)
+    {
+        return ip.compare(0, 2, "FF") == 0;
+    }
+#endif
+    return false;
 }
 
 void
-IceInternal::shutdownSocketReadWrite(SOCKET fd)
+IceInternal::setTcpBufSize(SOCKET fd, const Ice::PropertiesPtr& properties, const Ice::LoggerPtr& logger)
 {
-    if(shutdown(fd, SHUT_RDWR) == SOCKET_ERROR)
+    assert(fd != INVALID_SOCKET);
+
+    //
+    // By default, on Windows we use a 128KB buffer size. On Unix
+    // platforms, we use the system defaults.
+    //
+#ifdef _WIN32
+    const int dfltBufSize = 128 * 1024;
+#else
+    const int dfltBufSize = 0;
+#endif
+    Int sizeRequested;
+
+    sizeRequested = properties->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", dfltBufSize);
+    if(sizeRequested > 0)
     {
         //
-        // Ignore errors indicating that we are shutdown already.
-        //
-#if defined(_WIN32)
-        int error = WSAGetLastError();
-        //
-        // Under Vista its possible to get a WSAECONNRESET. See
-        // http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1739 for
-        // some details.
+        // Try to set the buffer size. The kernel will silently adjust
+        // the size to an acceptable value. Then read the size back to
+        // get the size that was actually set.
         //
-        if(error == WSAENOTCONN || error == WSAECONNRESET)
-        {
-            return;
-        }
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-        if(errno == ENOTCONN || errno == EINVAL)
+        setRecvBufferSize(fd, sizeRequested);
+        int size = getRecvBufferSize(fd);
+        if(size > 0 && size < sizeRequested) // Warn if the size that was set is less than the requested size.
         {
-            return;
+            Ice::Warning out(logger);
+            out << "TCP receive buffer size: requested size of " << sizeRequested << " adjusted to " << size;
         }
-#else
-        if(errno == ENOTCONN)
+    }
+    
+    sizeRequested = properties->getPropertyAsIntWithDefault("Ice.TCP.SndSize", dfltBufSize);
+    if(sizeRequested > 0)
+    {
+        //
+        // Try to set the buffer size. The kernel will silently adjust
+        // the size to an acceptable value. Then read the size back to
+        // get the size that was actually set.
+        //
+        setSendBufferSize(fd, sizeRequested);
+        int size = getSendBufferSize(fd);
+        if(size > 0 && size < sizeRequested) // Warn if the size that was set is less than the requested size.
         {
-            return;
+            Ice::Warning out(logger);
+            out << "TCP send buffer size: requested size of " << sizeRequested << " adjusted to " << size;
         }
-#endif
-
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
     }
 }
 
 void
 IceInternal::setBlock(SOCKET fd, bool block)
 {
+#ifndef ICE_OS_WINRT
     if(block)
     {
 #ifdef _WIN32
@@ -861,37 +1342,13 @@ IceInternal::setBlock(SOCKET fd, bool block)
         }
 #endif
     }
-}
-
-void
-IceInternal::setTcpNoDelay(SOCKET fd)
-{
-    int flag = 1;
-    if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR)
-    {
-        closeSocketNoThrow(fd);
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
-    }
-}
-
-void
-IceInternal::setKeepAlive(SOCKET fd)
-{
-    int flag = 1;
-    if(setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR)
-    {
-        closeSocketNoThrow(fd);
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
-    }
+#endif
 }
 
 void
 IceInternal::setSendBufferSize(SOCKET fd, int sz)
 {
+#ifndef ICE_OS_WINRT
     if(setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&sz, int(sizeof(int))) == SOCKET_ERROR)
     {
         closeSocketNoThrow(fd);
@@ -899,11 +1356,19 @@ IceInternal::setSendBufferSize(SOCKET fd, int sz)
         ex.error = getSocketErrno();
         throw ex;
     }
+#else
+    StreamSocket^ stream = dynamic_cast<StreamSocket^>(fd);
+    if(stream != nullptr)
+    {
+        stream->Control->OutboundBufferSizeInBytes = sz;
+    }
+#endif
 }
 
 int
 IceInternal::getSendBufferSize(SOCKET fd)
 {
+#ifndef ICE_OS_WINRT
     int sz;
     socklen_t len = sizeof(sz);
     if(getsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&sz, &len) == SOCKET_ERROR || 
@@ -915,11 +1380,20 @@ IceInternal::getSendBufferSize(SOCKET fd)
         throw ex;
     }
     return sz;
+#else
+    StreamSocket^ stream = dynamic_cast<StreamSocket^>(fd);
+    if(stream != nullptr)
+    {
+        return stream->Control->OutboundBufferSizeInBytes;
+    }
+    return 0; // Not supported
+#endif
 }
 
 void
 IceInternal::setRecvBufferSize(SOCKET fd, int sz)
 {
+#ifndef ICE_OS_WINRT
     if(setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&sz, int(sizeof(int))) == SOCKET_ERROR)
     {
         closeSocketNoThrow(fd);
@@ -927,11 +1401,13 @@ IceInternal::setRecvBufferSize(SOCKET fd, int sz)
         ex.error = getSocketErrno();
         throw ex;
     }
+#endif
 }
 
 int
 IceInternal::getRecvBufferSize(SOCKET fd)
 {
+#ifndef ICE_OS_WINRT
     int sz;
     socklen_t len = sizeof(sz);
     if(getsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&sz, &len) == SOCKET_ERROR || 
@@ -943,26 +1419,30 @@ IceInternal::getRecvBufferSize(SOCKET fd)
         throw ex;
     }
     return sz;
+#else
+    return 0; // Not supported
+#endif
 }
 
 void
-IceInternal::setMcastGroup(SOCKET fd, const struct sockaddr_storage& group, const string& interface)
+IceInternal::setMcastGroup(SOCKET fd, const Address& group, const string& intf)
 {
+#ifndef ICE_OS_WINRT
     int rc;
     if(group.ss_family == AF_INET)
     {
         struct ip_mreq mreq;
         mreq.imr_multiaddr = reinterpret_cast<const struct sockaddr_in*>(&group)->sin_addr;
         mreq.imr_interface.s_addr = INADDR_ANY;
-        if(interface.size() > 0)
+        if(intf.size() > 0)
         {
             //
             // First see if it is the interface name. If not check if IP Address.
             //
-            mreq.imr_interface = getInterfaceAddress(interface);
+            mreq.imr_interface = getInterfaceAddress(intf);
             if(mreq.imr_interface.s_addr == INADDR_ANY)
             {
-                struct sockaddr_storage addr = getAddressForServer(interface, 0, EnableIPv4);
+                Address addr = getAddressForServer(intf, 0, EnableIPv4);
                 mreq.imr_interface = reinterpret_cast<const struct sockaddr_in*>(&addr)->sin_addr;
             }
         }
@@ -973,15 +1453,15 @@ IceInternal::setMcastGroup(SOCKET fd, const struct sockaddr_storage& group, cons
         struct ipv6_mreq mreq;
         mreq.ipv6mr_multiaddr = reinterpret_cast<const struct sockaddr_in6*>(&group)->sin6_addr;
         mreq.ipv6mr_interface = 0;
-        if(interface.size() != 0)
+        if(intf.size() != 0)
         {
             //
             // First check if it is the interface name. If not check if index.
             //
-            mreq.ipv6mr_interface = getInterfaceIndex(interface);
+            mreq.ipv6mr_interface = getInterfaceIndex(intf);
             if(mreq.ipv6mr_interface == 0)
             {
-                istringstream p(interface);
+                istringstream p(intf);
                 if(!(p >> mreq.ipv6mr_interface) || !p.eof())
                 {
                     closeSocketNoThrow(fd);
@@ -1000,21 +1480,35 @@ IceInternal::setMcastGroup(SOCKET fd, const struct sockaddr_storage& group, cons
         ex.error = getSocketErrno();
         throw ex;
     }
+#else
+    try
+    {
+        //
+        // NOTE: WinRT doesn't allow specyfing the interface. 
+        //
+        safe_cast<DatagramSocket^>(fd)->JoinMulticastGroup(group.host);
+    }
+    catch(Platform::Exception^ pex)
+    {
+        throw SocketException(__FILE__, __LINE__, (int)SocketError::GetStatus(pex->HResult));
+    }
+#endif
 }
 
 void
-IceInternal::setMcastInterface(SOCKET fd, const string& interface, bool IPv4)
+IceInternal::setMcastInterface(SOCKET fd, const string& intf, const Address& addr)
 {
+#ifndef ICE_OS_WINRT
     int rc;
-    if(IPv4)
+    if(addr.ss_family == AF_INET)
     {
         //
         // First see if it is the interface name. If not check if IP Address.
         //
-        struct in_addr iface = getInterfaceAddress(interface);
+        struct in_addr iface = getInterfaceAddress(intf);
         if(iface.s_addr == INADDR_ANY)
         {
-            struct sockaddr_storage addr = getAddressForServer(interface, 0, EnableIPv4);
+            Address addr = getAddressForServer(intf, 0, EnableIPv4);
             iface = reinterpret_cast<const struct sockaddr_in*>(&addr)->sin_addr;
         }
         rc = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, (char*)&iface, int(sizeof(iface)));
@@ -1024,10 +1518,10 @@ IceInternal::setMcastInterface(SOCKET fd, const string& interface, bool IPv4)
         //
         // First check if it is the interface name. If not check if index.
         //
-        int interfaceNum = getInterfaceIndex(interface);
+        int interfaceNum = getInterfaceIndex(intf);
         if(interfaceNum == 0)
         {
-            istringstream p(interface);
+            istringstream p(intf);
             if(!(p >> interfaceNum) || !p.eof())
             {
                 closeSocketNoThrow(fd);
@@ -1044,13 +1538,15 @@ IceInternal::setMcastInterface(SOCKET fd, const string& interface, bool IPv4)
         ex.error = getSocketErrno();
         throw ex;
     }
+#endif
 }
 
 void
-IceInternal::setMcastTtl(SOCKET fd, int ttl, bool IPv4)
+IceInternal::setMcastTtl(SOCKET fd, int ttl, const Address& addr)
 {
+#ifndef ICE_OS_WINRT
     int rc;
-    if(IPv4)
+    if(addr.ss_family == AF_INET)
     {
         rc = setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, int(sizeof(int)));
     }
@@ -1065,11 +1561,13 @@ IceInternal::setMcastTtl(SOCKET fd, int ttl, bool IPv4)
         ex.error = getSocketErrno();
         throw ex;
     }
+#endif
 }
 
 void
 IceInternal::setReuseAddress(SOCKET fd, bool reuse)
 {
+#ifndef ICE_OS_WINRT
     int flag = reuse ? 1 : 0;
     if(setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char*)&flag, int(sizeof(int))) == SOCKET_ERROR)
     {
@@ -1078,11 +1576,53 @@ IceInternal::setReuseAddress(SOCKET fd, bool reuse)
         ex.error = getSocketErrno();
         throw ex;
     }
+#endif
 }
 
-struct sockaddr_storage
-IceInternal::doBind(SOCKET fd, const struct sockaddr_storage& addr)
+Address
+IceInternal::doBind(SOCKET fd, const Address& addr)
 {
+#ifdef ICE_OS_WINRT
+    Address local;
+    try
+    {
+        StreamSocketListener^ listener = dynamic_cast<StreamSocketListener^>(fd);
+        if(listener != nullptr)
+        {
+            if(addr.host == nullptr) // inaddr_any
+            {
+                concurrency::create_task(listener->BindServiceNameAsync(addr.port)).wait();
+            }
+            else
+            {
+                concurrency::create_task(listener->BindEndpointAsync(addr.host, addr.port)).wait();
+            }
+            local.host = addr.host;
+            local.port = listener->Information->LocalPort;
+        }
+        
+        DatagramSocket^ datagram = dynamic_cast<DatagramSocket^>(fd);
+        if(datagram != nullptr)
+        {
+            if(addr.host == nullptr) // inaddr_any
+            {
+                concurrency::create_task(datagram->BindServiceNameAsync(addr.port)).wait();
+            }
+            else
+            {
+                concurrency::create_task(datagram->BindEndpointAsync(addr.host, addr.port)).wait();
+            }
+            local.host = datagram->Information->LocalAddress;
+            local.port = datagram->Information->LocalPort;
+        }
+    }
+    catch(Platform::Exception^ pex)
+    {
+        closeSocketNoThrow(fd);
+        checkErrorCode(__FILE__, __LINE__, pex->HResult);
+    }
+    return local;
+#else
     int size;
     if(addr.ss_family == AF_INET)
     {
@@ -1106,7 +1646,7 @@ IceInternal::doBind(SOCKET fd, const struct sockaddr_storage& addr)
         throw ex;
     }
 
-    struct sockaddr_storage local;
+    Address local;
     socklen_t len = static_cast<socklen_t>(sizeof(local));
 #ifdef NDEBUG
     getsockname(fd, reinterpret_cast<struct sockaddr*>(&local), &len);
@@ -1115,6 +1655,166 @@ IceInternal::doBind(SOCKET fd, const struct sockaddr_storage& addr)
     assert(ret != SOCKET_ERROR);
 #endif
     return local;
+#endif
+}
+
+#ifndef ICE_OS_WINRT
+
+int
+IceInternal::getSocketErrno()
+{
+#if defined(_WIN32)
+    return WSAGetLastError();
+#else
+    return errno;
+#endif
+}
+
+bool
+IceInternal::interrupted()
+{
+#ifdef _WIN32
+    return WSAGetLastError() == WSAEINTR;
+#else
+#   ifdef EPROTO
+    return errno == EINTR || errno == EPROTO;
+#   else
+    return errno == EINTR;
+#   endif
+#endif
+}
+
+bool
+IceInternal::acceptInterrupted()
+{
+    if(interrupted())
+    {
+        return true;
+    }
+
+#ifdef _WIN32
+    int error = WSAGetLastError();
+    return error == WSAECONNABORTED ||
+           error == WSAECONNRESET ||
+           error == WSAETIMEDOUT;
+#else
+    return errno == ECONNABORTED ||
+           errno == ECONNRESET ||
+           errno == ETIMEDOUT;
+#endif
+}
+
+bool
+IceInternal::noBuffers()
+{
+#ifdef _WIN32
+    int error = WSAGetLastError();
+    return error == WSAENOBUFS ||
+           error == WSAEFAULT;
+#else
+    return errno == ENOBUFS;
+#endif
+}
+
+bool
+IceInternal::wouldBlock()
+{
+#ifdef _WIN32
+    int error = WSAGetLastError();
+    return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING || error == ERROR_IO_PENDING;
+#else
+    return errno == EAGAIN || errno == EWOULDBLOCK;
+#endif
+}
+
+bool
+IceInternal::connectFailed()
+{
+#if defined(_WIN32)
+    int error = WSAGetLastError();  
+    return error == WSAECONNREFUSED ||
+           error == WSAETIMEDOUT ||
+           error == WSAENETUNREACH ||
+           error == WSAEHOSTUNREACH ||
+           error == WSAECONNRESET ||
+           error == WSAESHUTDOWN ||
+           error == WSAECONNABORTED;
+#else
+    return errno == ECONNREFUSED ||
+           errno == ETIMEDOUT ||
+           errno == ENETUNREACH ||
+           errno == EHOSTUNREACH ||
+           errno == ECONNRESET ||
+           errno == ESHUTDOWN ||
+           errno == ECONNABORTED;
+#endif
+}
+
+bool
+IceInternal::connectionRefused()
+{
+#if defined(_WIN32)
+    int error = WSAGetLastError();
+    return error == WSAECONNREFUSED || error == ERROR_CONNECTION_REFUSED;
+#else
+    return errno == ECONNREFUSED;
+#endif
+}
+
+bool
+IceInternal::connectionLost()
+{
+#ifdef _WIN32
+    int error = WSAGetLastError();
+    return error == WSAECONNRESET ||
+           error == WSAESHUTDOWN ||
+           error == WSAENOTCONN ||
+#   ifdef ICE_USE_IOCP
+           error == ERROR_NETNAME_DELETED ||
+#   endif
+           error == WSAECONNABORTED;
+#else
+    return errno == ECONNRESET ||
+           errno == ENOTCONN ||
+           errno == ESHUTDOWN ||
+           errno == ECONNABORTED ||
+           errno == EPIPE;
+#endif
+}
+
+bool
+IceInternal::connectInProgress()
+{
+#ifdef _WIN32
+    int error = WSAGetLastError();
+    return error == WSAEWOULDBLOCK || error == WSA_IO_PENDING || error == ERROR_IO_PENDING;
+#else
+    return errno == EINPROGRESS;
+#endif
+}
+
+bool
+IceInternal::notConnected()
+{
+#ifdef _WIN32
+    return WSAGetLastError() == WSAENOTCONN;
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+    return errno == ENOTCONN || errno == EINVAL;
+#else
+    return errno == ENOTCONN;
+#endif
+}
+
+bool
+IceInternal::recvTruncated()
+{
+#ifdef _WIN32
+    int err = WSAGetLastError();
+    return  err == WSAEMSGSIZE || err == ERROR_MORE_DATA;
+#else
+    // We don't get an error under Linux if a datagram is truncated.
+    return false;
+#endif
 }
 
 void
@@ -1136,7 +1836,7 @@ repeatListen:
 }
 
 bool
-IceInternal::doConnect(SOCKET fd, const struct sockaddr_storage& addr)
+IceInternal::doConnect(SOCKET fd, const Address& addr)
 {
 repeatConnect:
     int size;
@@ -1193,7 +1893,7 @@ repeatConnect:
     // a server which was just deactivated if the client socket re-uses the same ephemeral
     // port as the server).
     //
-    struct sockaddr_storage localAddr;
+    Address localAddr;
     fdToLocalAddress(fd, localAddr);
     if(compareAddress(addr, localAddr) == 0)
     {
@@ -1218,7 +1918,7 @@ IceInternal::doFinishConnect(SOCKET fd)
     // necessary, otherwise no error is reported through
     // getsockopt.
     //
-#ifdef _WIN32
+#if defined(_WIN32)
     Sleep(0);
 #endif
 
@@ -1230,10 +1930,10 @@ IceInternal::doFinishConnect(SOCKET fd)
         ex.error = getSocketErrno();
         throw ex;
     }
-
+    
     if(val > 0)
     {
-#ifdef _WIN32
+#if defined(_WIN32)
         WSASetLastError(val);
 #else
         errno = val;
@@ -1264,9 +1964,9 @@ IceInternal::doFinishConnect(SOCKET fd)
     // a server which was just deactivated if the client socket re-uses the same ephemeral
     // port as the server).
     //
-    struct sockaddr_storage localAddr;
+    Address localAddr;
     fdToLocalAddress(fd, localAddr);
-    struct sockaddr_storage remoteAddr;
+    Address remoteAddr;
     if(fdToRemoteAddress(fd, remoteAddr) && compareAddress(remoteAddr, localAddr) == 0)
     {
         ConnectionRefusedException ex(__FILE__, __LINE__);
@@ -1276,141 +1976,6 @@ IceInternal::doFinishConnect(SOCKET fd)
 #endif
 }
 
-#ifdef ICE_USE_IOCP
-void
-IceInternal::doConnectAsync(SOCKET fd, const struct sockaddr_storage& addr, AsyncInfo& info)
-{
-    //
-    // NOTE: It's the caller's responsability to close the socket upon
-    // failure to connect. The socket isn't closed by this method.
-    //
-
-    struct sockaddr_storage bindAddr;
-    memset(&bindAddr, 0, sizeof(bindAddr));
-
-    int size;
-    if(addr.ss_family == AF_INET)
-    {
-        size = sizeof(sockaddr_in);
-
-        struct sockaddr_in* addrin = reinterpret_cast<struct sockaddr_in*>(&bindAddr);
-        addrin->sin_family = AF_INET;
-        addrin->sin_port = htons(0);
-        addrin->sin_addr.s_addr = htonl(INADDR_ANY);
-    }
-    else if(addr.ss_family == AF_INET6)
-    {
-        size = sizeof(sockaddr_in6);
-
-        struct sockaddr_in6* addrin = reinterpret_cast<struct sockaddr_in6*>(&bindAddr);
-        addrin->sin6_family = AF_INET6;
-        addrin->sin6_port = htons(0);
-        addrin->sin6_addr = in6addr_any;
-    }
-    else
-    {
-        assert(false);
-        size = 0; // Keep the compiler happy.
-    }
-
-    if(bind(fd, reinterpret_cast<const struct sockaddr*>(&bindAddr), size) == SOCKET_ERROR)
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
-    }
-
-    LPFN_CONNECTEX ConnectEx = NULL; // a pointer to the 'ConnectEx()' function
-    GUID GuidConnectEx = WSAID_CONNECTEX; // The Guid
-    DWORD dwBytes;
-    if(WSAIoctl(fd, 
-                SIO_GET_EXTENSION_FUNCTION_POINTER,
-                &GuidConnectEx,
-                sizeof(GuidConnectEx),
-                &ConnectEx,
-                sizeof(ConnectEx),
-                &dwBytes,
-                NULL, 
-                NULL) == SOCKET_ERROR)
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
-    }        
-
-    if(!ConnectEx(fd, reinterpret_cast<const struct sockaddr*>(&addr), size, 0, 0, 0, 
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                  reinterpret_cast<LPOVERLAPPED>(&info)
-#else
-                  &info
-#endif
-                  ))
-    {
-        if(!connectInProgress())
-        {
-            if(connectionRefused())
-            {
-                ConnectionRefusedException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
-            }
-            else if(connectFailed())
-            {
-                ConnectFailedException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
-            }
-            else
-            {
-                SocketException ex(__FILE__, __LINE__);
-                ex.error = getSocketErrno();
-                throw ex;
-            }
-        }
-    }
-
-}
-
-void
-IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info)
-{
-    //
-    // NOTE: It's the caller's responsability to close the socket upon
-    // failure to connect. The socket isn't closed by this method.
-    //
-
-    if(info.count == SOCKET_ERROR)
-    {
-        WSASetLastError(info.error);
-        if(connectionRefused())
-        {
-            ConnectionRefusedException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
-        }
-        else if(connectFailed())
-        {
-            ConnectFailedException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
-        }
-        else
-        {
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
-        }
-    }
-
-    if(setsockopt(fd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) == SOCKET_ERROR)
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
-    }
-}
-#endif
-
 SOCKET
 IceInternal::doAccept(SOCKET fd)
 {
@@ -1438,212 +2003,16 @@ repeatAccept:
     return ret;
 }
 
-struct sockaddr_storage
-IceInternal::getAddressForServer(const string& host, int port, ProtocolSupport protocol)
-{
-    return getAddressImpl(host, port, protocol, true);
-}
-
-struct sockaddr_storage
-IceInternal::getAddress(const string& host, int port, ProtocolSupport protocol)
-{
-    return getAddressImpl(host, port, protocol, false);
-}
-
-vector<struct sockaddr_storage>
-IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol, bool blocking)
-{
-    vector<struct sockaddr_storage> result;
-    struct sockaddr_storage addr;
-    memset(&addr, 0, sizeof(struct sockaddr_storage));
-
-    //
-    // We don't use getaddrinfo when host is empty as it's not portable (some old Linux
-    // versions don't support it).
-    //
-    if(host.empty())
-    {
-        if(protocol != EnableIPv4)
-        {
-            sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
-            addrin6->sin6_family = AF_INET6;
-            addrin6->sin6_port = htons(port);
-            addrin6->sin6_addr = in6addr_loopback;
-            result.push_back(addr);
-        }
-        if(protocol != EnableIPv6)
-        {
-            sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
-            addrin->sin_family = AF_INET;
-            addrin->sin_port = htons(port);
-            addrin->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-            result.push_back(addr);
-        }
-        return result;
-    }
-
-    struct addrinfo* info = 0;
-    int retry = 5;
-
-    struct addrinfo hints = { 0 };
-    if(protocol == EnableIPv4)
-    {
-        hints.ai_family = PF_INET;
-    }
-    else if(protocol == EnableIPv6)
-    {
-        hints.ai_family = PF_INET6;
-    }
-    else
-    {
-        hints.ai_family = PF_UNSPEC;
-    }
-
-    if(!blocking)
-    {
-        hints.ai_flags = AI_NUMERICHOST;
-    }
-
-    int rs = 0;
-    do
-    {
-        rs = getaddrinfo(host.c_str(), 0, &hints, &info);
-    }
-    while(info == 0 && rs == EAI_AGAIN && --retry >= 0);
-
-    // In theory, getaddrinfo should only return EAI_NONAME if AI_NUMERICHOST is specified and the host name
-    // is not a IP address. However on some platforms (e.g. Mac OS X 10.4.x) EAI_NODATA is also returned so 
-    // we also check for it.
-#ifdef EAI_NODATA
-    if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA))
-#else
-    if(!blocking && rs == EAI_NONAME)
-#endif
-    {
-        return result; // Empty result indicates that a blocking lookup is necessary.
-    }
-    else if(rs != 0)
-    {
-        DNSException ex(__FILE__, __LINE__);
-        ex.error = rs;
-        ex.host = host;
-        throw ex;
-    }
-
-    struct addrinfo* p;
-    for(p = info; p != NULL; p = p->ai_next)
-    {
-        memcpy(&addr, p->ai_addr, p->ai_addrlen);
-        if(p->ai_family == PF_INET)
-        {
-            struct sockaddr_in* addrin = reinterpret_cast<sockaddr_in*>(&addr);
-            addrin->sin_port = htons(port);
-        }
-        else if(p->ai_family == PF_INET6)
-        {
-            struct sockaddr_in6* addrin6 = reinterpret_cast<sockaddr_in6*>(&addr);
-            addrin6->sin6_port = htons(port);
-        }
-
-        bool found = false;
-        for(unsigned int i = 0; i < result.size(); ++i)
-        {
-            if(compareAddress(result[i], addr) == 0)
-            {
-                found = true;
-                break;
-            }
-        }
-        if(!found)
-        {
-            result.push_back(addr);
-        }
-    }
-
-    freeaddrinfo(info);
-
-    if(result.size() == 0)
-    {
-        DNSException ex(__FILE__, __LINE__);
-        ex.host = host;
-        throw ex;
-    }
-
-    return result;
-}
-
-int
-IceInternal::compareAddress(const struct sockaddr_storage& addr1, const struct sockaddr_storage& addr2)
-{
-    if(addr1.ss_family < addr2.ss_family)
-    {
-        return -1;
-    }
-    else if(addr2.ss_family < addr1.ss_family)
-    {
-        return 1;
-    }
-
-    if(addr1.ss_family == AF_INET)
-    {
-        const struct sockaddr_in* addr1in = reinterpret_cast<const sockaddr_in*>(&addr1);
-        const struct sockaddr_in* addr2in = reinterpret_cast<const sockaddr_in*>(&addr2);
-
-        if(addr1in->sin_port < addr2in->sin_port)
-        {
-            return -1;
-        }
-        else if(addr2in->sin_port < addr1in->sin_port)
-        {
-            return 1;
-        }
-
-        if(addr1in->sin_addr.s_addr < addr2in->sin_addr.s_addr)
-        {
-            return -1;
-        }
-        else if(addr2in->sin_addr.s_addr < addr1in->sin_addr.s_addr)
-        {
-            return 1;
-        }
-    }
-    else
-    {
-        const struct sockaddr_in6* addr1in = reinterpret_cast<const sockaddr_in6*>(&addr1);
-        const struct sockaddr_in6* addr2in = reinterpret_cast<const sockaddr_in6*>(&addr2);
-
-        if(addr1in->sin6_port < addr2in->sin6_port)
-        {
-            return -1;
-        }
-        else if(addr2in->sin6_port < addr1in->sin6_port)
-        {
-            return 1;
-        }
-
-        int res = memcmp(&addr1in->sin6_addr, &addr2in->sin6_addr, sizeof(struct in6_addr));
-        if(res < 0)
-        {
-            return -1;
-        }
-        else if(res > 0)
-        {
-            return 1;
-        }
-    }
-
-    return 0;
-}
 
 void
 IceInternal::createPipe(SOCKET fds[2])
 {
 #ifdef _WIN32
 
-    SOCKET fd = createSocket(false, AF_INET);
+    SOCKET fd = createSocketImpl(false, AF_INET);
     setBlock(fd, true);
 
-    struct sockaddr_storage addr;
+    Address addr;
     memset(&addr, 0, sizeof(addr));
 
     struct sockaddr_in* addrin = reinterpret_cast<struct sockaddr_in*>(&addr);
@@ -1656,7 +2025,7 @@ IceInternal::createPipe(SOCKET fds[2])
 
     try
     {
-        fds[0] = createSocket(false, AF_INET);
+        fds[0] = createSocketImpl(false, AF_INET);
     }
     catch(...)
     {
@@ -1739,290 +2108,204 @@ IceInternal::createPipe(SOCKET fds[2])
 #endif
 }
 
-#ifdef _WIN32
-
-string
-IceInternal::errorToStringDNS(int error)
-{
-    return IceUtilInternal::errorToString(error);
-}
-
-#else
+#else // ICE_OS_WINRT
 
-string
-IceInternal::errorToStringDNS(int error)
-{
-    return gai_strerror(error);
-}
-
-#endif
-
-std::string
-IceInternal::fdToString(SOCKET fd)
+void
+IceInternal::checkConnectErrorCode(const char* file, int line, HRESULT herr, HostName^ host)
 {
-    if(fd == INVALID_SOCKET)
+    SocketErrorStatus error = SocketError::GetStatus(herr);
+    if(error == SocketErrorStatus::ConnectionRefused)
     {
-        return "<closed>";
+        ConnectionRefusedException ex(file, line);
+        ex.error = static_cast<int>(error);
+        throw ex;
     }
-
-    struct sockaddr_storage localAddr;
-    fdToLocalAddress(fd, localAddr);
-
-    struct sockaddr_storage remoteAddr;
-    bool peerConnected = fdToRemoteAddress(fd, remoteAddr);
-
-    return addressesToString(localAddr, remoteAddr, peerConnected);
-};
-
-void
-IceInternal::fdToAddressAndPort(SOCKET fd, string& localAddress, int& localPort, string& remoteAddress, int& remotePort)
-{
-    if(fd == INVALID_SOCKET)
+    else if(error == SocketErrorStatus::NetworkDroppedConnectionOnReset ||
+            error == SocketErrorStatus::ConnectionTimedOut ||
+            error == SocketErrorStatus::NetworkIsUnreachable ||
+            error == SocketErrorStatus::UnreachableHost ||
+            error == SocketErrorStatus::ConnectionResetByPeer ||
+            error == SocketErrorStatus::SoftwareCausedConnectionAbort)
     {
-        localAddress.clear();
-        remoteAddress.clear();
-        localPort = -1;
-        remotePort = -1;
-        return;
+        ConnectFailedException ex(file, line);
+        ex.error = static_cast<int>(error);
+        throw ex;
     }
-
-    struct sockaddr_storage localAddr;
-    fdToLocalAddress(fd, localAddr);
-    addrToAddressAndPort(localAddr, localAddress, localPort);
-
-    struct sockaddr_storage remoteAddr;
-    if(fdToRemoteAddress(fd, remoteAddr))
+    else if(error == SocketErrorStatus::HostNotFound)
     {
-        addrToAddressAndPort(remoteAddr, remoteAddress, remotePort);
+        DNSException ex(file, line);
+        ex.error = static_cast<int>(error);
+        ex.host = IceUtil::wstringToString(host->RawName->Data());
+        throw ex;
     }
     else
     {
-        remoteAddress.clear();
-        remotePort = -1;
+        SocketException ex(file, line);
+        ex.error = static_cast<int>(error);
+        throw ex;
     }
 }
 
 void
-IceInternal::addrToAddressAndPort(const struct sockaddr_storage& addr, string& address, int& port)
-{
-    address = inetAddrToString(addr);
-    port = getPort(addr);
-}
-
-std::string
-IceInternal::addressesToString(const struct sockaddr_storage& localAddr, const struct sockaddr_storage& remoteAddr,
-                               bool peerConnected)
+IceInternal::checkErrorCode(const char* file, int line, HRESULT herr)
 {
-    ostringstream s;
-    s << "local address = " << addrToString(localAddr);
-    if(peerConnected)
+    SocketErrorStatus error = SocketError::GetStatus(herr);
+    if(error == SocketErrorStatus::NetworkDroppedConnectionOnReset ||
+       error == SocketErrorStatus::SoftwareCausedConnectionAbort ||
+       error == SocketErrorStatus::ConnectionResetByPeer)
     {
-        s << "\nremote address = " << addrToString(remoteAddr);
+        ConnectionLostException ex(file, line);
+        ex.error = static_cast<int>(error);
+        throw ex;
     }
-    else
+    else if(error == SocketErrorStatus::HostNotFound)
     {
-        s << "\nremote address = <not connected>";
+        DNSException ex(file, line);
+        ex.error = static_cast<int>(error);
+        throw ex;
     }
-    return s.str();
-}
-
-void
-IceInternal::fdToLocalAddress(SOCKET fd, struct sockaddr_storage& addr)
-{
-    socklen_t len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
-    if(getsockname(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
+    else
     {
-        closeSocketNoThrow(fd);
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
+        SocketException ex(file, line);
+        ex.error = static_cast<int>(error);
         throw ex;
     }
 }
 
-bool
-IceInternal::fdToRemoteAddress(SOCKET fd, struct sockaddr_storage& addr)
-{
-    socklen_t len = static_cast<socklen_t>(sizeof(struct sockaddr_storage));
-    if(getpeername(fd, reinterpret_cast<struct sockaddr*>(&addr), &len) == SOCKET_ERROR)
-    {
-        if(notConnected())
-        {
-            return false;
-        }
-        else
-        {
-            closeSocketNoThrow(fd);
-            SocketException ex(__FILE__, __LINE__);
-            ex.error = getSocketErrno();
-            throw ex;
-        }
-    }
 
-    return true;
-}
+#endif
 
-string
-IceInternal::inetAddrToString(const struct sockaddr_storage& ss)
+#if defined(ICE_USE_IOCP)
+void
+IceInternal::doConnectAsync(SOCKET fd, const Address& addr, AsyncInfo& info)
 {
-    int size = 0;
-    if(ss.ss_family == AF_INET)
-    {
-        size = sizeof(sockaddr_in);
-    }
-    else if(ss.ss_family == AF_INET6)
-    {
-        size = sizeof(sockaddr_in6);
-    }
-    else
-    {
-        return "";
-    }
-
-    char namebuf[1024];
-    namebuf[0] = '\0';
-    getnameinfo(reinterpret_cast<const struct sockaddr *>(&ss), size, namebuf, sizeof(namebuf), 0, 0, NI_NUMERICHOST);
-    return string(namebuf);
-}
+    //
+    // NOTE: It's the caller's responsability to close the socket upon
+    // failure to connect. The socket isn't closed by this method.
+    //
 
-string
-IceInternal::addrToString(const struct sockaddr_storage& addr)
-{
-    ostringstream s;
-    string port;
-    s << inetAddrToString(addr) << ':' << getPort(addr);
-    return s.str();
-}
+    Address bindAddr;
+    memset(&bindAddr, 0, sizeof(bindAddr));
 
-bool
-IceInternal::isMulticast(const struct sockaddr_storage& addr)
-{
+    int size;
     if(addr.ss_family == AF_INET)
     {
-        return IN_MULTICAST(ntohl(reinterpret_cast<const struct sockaddr_in*>(&addr)->sin_addr.s_addr));
-    }
-    else if(addr.ss_family == AF_INET6)
-    {
-        return IN6_IS_ADDR_MULTICAST(&reinterpret_cast<const struct sockaddr_in6*>(&addr)->sin6_addr);
-    }
-    else
-    {
-        return false;
-    }
-}
+        size = sizeof(sockaddr_in);
 
-int
-IceInternal::getPort(const struct sockaddr_storage& addr)
-{
-    if(addr.ss_family == AF_INET)
-    {
-        return ntohs(reinterpret_cast<const sockaddr_in*>(&addr)->sin_port);
+        struct sockaddr_in* addrin = reinterpret_cast<struct sockaddr_in*>(&bindAddr);
+        addrin->sin_family = AF_INET;
+        addrin->sin_port = htons(0);
+        addrin->sin_addr.s_addr = htonl(INADDR_ANY);
     }
     else if(addr.ss_family == AF_INET6)
     {
-        return ntohs(reinterpret_cast<const sockaddr_in6*>(&addr)->sin6_port);
+        size = sizeof(sockaddr_in6);
+
+        struct sockaddr_in6* addrin = reinterpret_cast<struct sockaddr_in6*>(&bindAddr);
+        addrin->sin6_family = AF_INET6;
+        addrin->sin6_port = htons(0);
+        addrin->sin6_addr = in6addr_any;
     }
     else
     {
-        return -1;
+        assert(false);
+        size = 0; // Keep the compiler happy.
     }
-}
 
-void
-IceInternal::setPort(struct sockaddr_storage& addr, int port)
-{
-    if(addr.ss_family == AF_INET)
+    if(bind(fd, reinterpret_cast<const struct sockaddr*>(&bindAddr), size) == SOCKET_ERROR)
     {
-        reinterpret_cast<sockaddr_in*>(&addr)->sin_port = htons(port);
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
     }
-    else
+
+    LPFN_CONNECTEX ConnectEx = NULL; // a pointer to the 'ConnectEx()' function
+    GUID GuidConnectEx = WSAID_CONNECTEX; // The Guid
+    DWORD dwBytes;
+    if(WSAIoctl(fd, 
+                SIO_GET_EXTENSION_FUNCTION_POINTER,
+                &GuidConnectEx,
+                sizeof(GuidConnectEx),
+                &ConnectEx,
+                sizeof(ConnectEx),
+                &dwBytes,
+                NULL, 
+                NULL) == SOCKET_ERROR)
     {
-        assert(addr.ss_family == AF_INET6);
-        reinterpret_cast<sockaddr_in6*>(&addr)->sin6_port = htons(port);
-    }
-}
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
+    }        
 
-vector<string>
-IceInternal::getHostsForEndpointExpand(const string& host, ProtocolSupport protocolSupport, bool includeLoopback)
-{
-    vector<string> hosts;
-    if(host.empty() || isWildcard(host, protocolSupport))
+    if(!ConnectEx(fd, reinterpret_cast<const struct sockaddr*>(&addr), size, 0, 0, 0, 
+#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
+                  reinterpret_cast<LPOVERLAPPED>(&info)
+#else
+                  &info
+#endif
+                  ))
     {
-        vector<struct sockaddr_storage> addrs = getLocalAddresses(protocolSupport);
-        for(vector<struct sockaddr_storage>::const_iterator p = addrs.begin(); p != addrs.end(); ++p)
+        if(!connectInProgress())
         {
-            //
-            // NOTE: We don't publish link-local IPv6 addresses as these addresses can only
-            // be accessed in general with a scope-id.
-            //
-            if(p->ss_family != AF_INET6 ||
-               !IN6_IS_ADDR_LINKLOCAL(&reinterpret_cast<const struct sockaddr_in6*>(&(*p))->sin6_addr))
+            if(connectionRefused())
             {
-                hosts.push_back(inetAddrToString(*p));
+                ConnectionRefusedException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
             }
-        }
-
-        if(hosts.empty() || includeLoopback)
-        {
-            if(protocolSupport != EnableIPv6)
+            else if(connectFailed())
             {
-                hosts.push_back("127.0.0.1");
+                ConnectFailedException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
             }
-            if(protocolSupport != EnableIPv4)
+            else
             {
-                hosts.push_back("0:0:0:0:0:0:0:1");
+                SocketException ex(__FILE__, __LINE__);
+                ex.error = getSocketErrno();
+                throw ex;
             }
         }
     }
-    return hosts; // An empty host list indicates to just use the given host.
 }
 
 void
-IceInternal::setTcpBufSize(SOCKET fd, const Ice::PropertiesPtr& properties, const Ice::LoggerPtr& logger)
+IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info)
 {
-    assert(fd != INVALID_SOCKET);
-
     //
-    // By default, on Windows we use a 128KB buffer size. On Unix
-    // platforms, we use the system defaults.
+    // NOTE: It's the caller's responsability to close the socket upon
+    // failure to connect. The socket isn't closed by this method.
     //
-#ifdef _WIN32
-    const int dfltBufSize = 128 * 1024;
-#else
-    const int dfltBufSize = 0;
-#endif
-    Int sizeRequested;
 
-    sizeRequested = properties->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", dfltBufSize);
-    if(sizeRequested > 0)
+    if(info.count == SOCKET_ERROR)
     {
-        //
-        // Try to set the buffer size. The kernel will silently adjust
-        // the size to an acceptable value. Then read the size back to
-        // get the size that was actually set.
-        //
-        setRecvBufferSize(fd, sizeRequested);
-        int size = getRecvBufferSize(fd);
-        if(size < sizeRequested) // Warn if the size that was set is less than the requested size.
+        WSASetLastError(info.error);
+        if(connectionRefused())
         {
-            Ice::Warning out(logger);
-            out << "TCP receive buffer size: requested size of " << sizeRequested << " adjusted to " << size;
+            ConnectionRefusedException ex(__FILE__, __LINE__);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else if(connectFailed())
+        {
+            ConnectFailedException ex(__FILE__, __LINE__);
+            ex.error = getSocketErrno();
+            throw ex;
+        }
+        else
+        {
+            SocketException ex(__FILE__, __LINE__);
+            ex.error = getSocketErrno();
+            throw ex;
         }
     }
 
-    sizeRequested = properties->getPropertyAsIntWithDefault("Ice.TCP.SndSize", dfltBufSize);
-    if(sizeRequested > 0)
+    if(setsockopt(fd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) == SOCKET_ERROR)
     {
-        //
-        // Try to set the buffer size. The kernel will silently adjust
-        // the size to an acceptable value. Then read the size back to
-        // get the size that was actually set.
-        //
-        setSendBufferSize(fd, sizeRequested);
-        int size = getSendBufferSize(fd);
-        if(size < sizeRequested) // Warn if the size that was set is less than the requested size.
-        {
-            Ice::Warning out(logger);
-            out << "TCP send buffer size: requested size of " << sizeRequested << " adjusted to " << size;
-        }
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = getSocketErrno();
+        throw ex;
     }
 }
+#endif
+
diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h
index 8e5ca6eda68..66c700dbf23 100644
--- a/cpp/src/Ice/Network.h
+++ b/cpp/src/Ice/Network.h
@@ -15,11 +15,14 @@
 #endif
 
 #include <Ice/Config.h>
+
 #include <Ice/PropertiesF.h> // For setTcpBufSize
 #include <Ice/LoggerF.h> // For setTcpBufSize
 #include <Ice/Protocol.h> 
 
-#ifdef _WIN32
+#ifdef ICE_OS_WINRT
+#   include <Ice/EventHandlerF.h>
+#elif defined(_WIN32)
 #   include <winsock2.h>
 #   include <ws2tcpip.h>
 typedef int ssize_t;
@@ -39,7 +42,8 @@ typedef int ssize_t;
 #elif (defined(__APPLE__) || defined(__FreeBSD__)) && !defined(ICE_NO_KQUEUE)
 #   define ICE_USE_KQUEUE 1
 #elif defined(_WIN32)
-#  if !defined(ICE_NO_IOCP)
+#  if defined(ICE_OS_WINRT)
+#  elif !defined(ICE_NO_IOCP)
 #     define ICE_USE_IOCP 1
 #  else
 #     define ICE_USE_SELECT 1
@@ -52,10 +56,14 @@ typedef int ssize_t;
 typedef int socklen_t;
 #endif
 
-#ifndef _WIN32
+#if !defined(_WIN32)
 #   define SOCKET int
-#   define SOCKET_ERROR -1
 #   define INVALID_SOCKET -1
+#   define SOCKET_ERROR -1
+#elif defined(ICE_OS_WINRT)
+    typedef Platform::Object^ SOCKET;
+#   define INVALID_SOCKET nullptr
+#   define SOCKET_ERROR -1
 #endif
 
 #ifndef SHUT_RD
@@ -81,6 +89,19 @@ typedef int socklen_t;
 namespace IceInternal
 {
 
+//
+// Use Address typedef/struct depending on the platform
+//
+#ifdef ICE_OS_WINRT
+struct ICE_API Address
+{
+    Windows::Networking::HostName^ host;
+    Platform::String^ port;
+};
+#else
+typedef struct sockaddr_storage Address;
+#endif
+
 enum SocketOperation
 {
     SocketOperationNone = 0,
@@ -89,8 +110,11 @@ enum SocketOperation
     SocketOperationConnect = 2
 };
 
-#ifdef ICE_USE_IOCP
-
+//
+// AsyncInfo struct for Windows IOCP or WinRT holds the result of
+// asynchronous operations after it completed.
+//
+#if defined(ICE_USE_IOCP)
 struct ICE_API AsyncInfo : WSAOVERLAPPED
 {
     AsyncInfo(SocketOperation);
@@ -101,8 +125,15 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED
     DWORD count;
     int error;
 };
-
-#endif 
+#elif defined(ICE_OS_WINRT)
+struct ICE_API AsyncInfo
+{
+    int count;
+    int error;
+};
+  
+public delegate void SocketOperationCompletedHandler(int);
+#endif
 
 class ICE_API NativeInfo : virtual public IceUtil::Shared
 {
@@ -117,11 +148,13 @@ public:
         return _fd;
     }
 
-#ifdef ICE_USE_IOCP
     //
     // This is implemented by transceiver and acceptor implementations.
     //
+#if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation) = 0;
+#elif defined(ICE_OS_WINRT)
+    virtual void setCompletedHandler(SocketOperationCompletedHandler^) = 0;
 #endif
 
 protected:
@@ -130,73 +163,79 @@ protected:
 };
 typedef IceUtil::Handle<NativeInfo> NativeInfoPtr;
 
-ICE_API bool interrupted();
-ICE_API bool acceptInterrupted();
-ICE_API bool noBuffers();
-ICE_API bool wouldBlock();
-ICE_API bool connectFailed();
-ICE_API bool connectionRefused();
-ICE_API bool connectInProgress();
-ICE_API bool connectionLost();
-ICE_API bool notConnected();
-ICE_API bool recvTruncated();
 ICE_API bool noMoreFds(int);
+ICE_API std::string errorToStringDNS(int);
+ICE_API std::vector<Address> getAddresses(const std::string&, int, ProtocolSupport, bool);
+ICE_API ProtocolSupport getProtocolSupport(const Address&);
+ICE_API Address getAddressForServer(const std::string&, int, ProtocolSupport);
+ICE_API Address getAddress(const std::string&, int, ProtocolSupport);
+ICE_API int compareAddress(const Address&, const Address&);
 
-ICE_API SOCKET createSocket(bool, int);
-ICE_API void closeSocket(SOCKET);
+ICE_API SOCKET createSocket(bool, const Address&);
 ICE_API void closeSocketNoThrow(SOCKET);
-ICE_API void shutdownSocketWrite(SOCKET);
-ICE_API void shutdownSocketReadWrite(SOCKET);
+ICE_API void closeSocket(SOCKET);
+
+ICE_API std::string addrToString(const Address&);
+ICE_API void fdToLocalAddress(SOCKET, Address&);
+ICE_API bool fdToRemoteAddress(SOCKET, Address&);
+ICE_API std::string fdToString(SOCKET);
+ICE_API void fdToAddressAndPort(SOCKET, std::string&, int&, std::string&, int&);
+ICE_API void addrToAddressAndPort(const Address&, std::string&, int&);
+ICE_API std::string addressesToString(const Address&, const Address&, bool);
+ICE_API bool isAddressValid(const Address&);
+
+ICE_API std::vector<std::string> getHostsForEndpointExpand(const std::string&, ProtocolSupport, bool);
+
+ICE_API std::string inetAddrToString(const Address&);
+ICE_API int getPort(const Address&);
+ICE_API void setPort(Address&, int);
+
+ICE_API bool isMulticast(const Address&);
+ICE_API void setTcpBufSize(SOCKET, const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
 
 ICE_API void setBlock(SOCKET, bool);
-ICE_API void setTcpNoDelay(SOCKET);
-ICE_API void setKeepAlive(SOCKET);
 ICE_API void setSendBufferSize(SOCKET, int);
 ICE_API int getSendBufferSize(SOCKET);
 ICE_API void setRecvBufferSize(SOCKET, int);
 ICE_API int getRecvBufferSize(SOCKET);
-ICE_API void setMcastGroup(SOCKET, const struct sockaddr_storage&, const std::string&);
-ICE_API void setMcastInterface(SOCKET, const std::string&, bool);
-ICE_API void setMcastTtl(SOCKET, int, bool);
+
+ICE_API void setMcastGroup(SOCKET, const Address&, const std::string&);
+ICE_API void setMcastInterface(SOCKET, const std::string&, const Address&);
+ICE_API void setMcastTtl(SOCKET, int, const Address&);
 ICE_API void setReuseAddress(SOCKET, bool);
 
-ICE_API struct sockaddr_storage doBind(SOCKET, const struct sockaddr_storage&);
+ICE_API Address doBind(SOCKET, const Address&);
+
+#ifndef ICE_OS_WINRT
+ICE_API bool interrupted();
+ICE_API bool acceptInterrupted();
+ICE_API bool noBuffers();
+ICE_API bool wouldBlock();
+ICE_API bool notConnected();
+ICE_API bool recvTruncated();
+
+ICE_API bool connectFailed();
+ICE_API bool connectionRefused();
+ICE_API bool connectInProgress();
+ICE_API bool connectionLost();
+
 ICE_API void doListen(SOCKET, int);
-ICE_API bool doConnect(SOCKET, const struct sockaddr_storage&);
+ICE_API bool doConnect(SOCKET, const Address&);
 ICE_API void doFinishConnect(SOCKET);
-#ifdef ICE_USE_IOCP
-ICE_API void doConnectAsync(SOCKET, const struct sockaddr_storage&, AsyncInfo&);
-ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
-#endif
 ICE_API SOCKET doAccept(SOCKET);
 
-ICE_API struct sockaddr_storage getAddressForServer(const std::string&, int, ProtocolSupport);
-ICE_API struct sockaddr_storage getAddress(const std::string&, int, ProtocolSupport);
-ICE_API std::vector<struct sockaddr_storage> getAddresses(const std::string&, int, ProtocolSupport, bool);
-
-ICE_API int compareAddress(const struct sockaddr_storage&, const struct sockaddr_storage&);
-
 ICE_API void createPipe(SOCKET fds[2]);
 
-ICE_API std::string errorToStringDNS(int);
-
-ICE_API std::string fdToString(SOCKET);
-ICE_API void fdToAddressAndPort(SOCKET, std::string&, int&, std::string&, int&);
-ICE_API void addrToAddressAndPort(const struct sockaddr_storage&, std::string&, int&);
-ICE_API std::string addressesToString(const struct sockaddr_storage&, const struct sockaddr_storage&, bool);
-ICE_API void fdToLocalAddress(SOCKET, struct sockaddr_storage&);
-ICE_API bool fdToRemoteAddress(SOCKET, struct sockaddr_storage&);
-ICE_API std::string inetAddrToString(const struct sockaddr_storage&);
-ICE_API std::string addrToString(const struct sockaddr_storage&);
-ICE_API bool isMulticast(const struct sockaddr_storage&);
-ICE_API int getPort(const struct sockaddr_storage&);
-ICE_API void setPort(struct sockaddr_storage&, int);
-
-ICE_API std::vector<std::string> getHostsForEndpointExpand(const std::string&, ProtocolSupport, bool);
-ICE_API void setTcpBufSize(SOCKET, const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
-
 ICE_API int getSocketErrno();
+#else
+ICE_API void checkConnectErrorCode(const char*, int, HRESULT, Windows::Networking::HostName^);
+ICE_API void checkErrorCode(const char*, int, HRESULT);
+#endif
 
+#if defined(ICE_USE_IOCP)
+ICE_API void doConnectAsync(SOCKET, const Address&, AsyncInfo&);
+ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&);
+#endif
 }
 
 #endif
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 271696ff28d..fb2ca88bdb5 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -7,10 +7,10 @@
 //
 // **********************************************************************
 
+#include <Ice/PropertiesI.h>
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/FileUtil.h>
-#include <Ice/PropertiesI.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
 #include <Ice/PropertyNames.h>
@@ -285,7 +285,10 @@ Ice::PropertiesI::parseIceCommandLineOptions(const StringSeq& options)
 void
 Ice::PropertiesI::load(const std::string& file)
 {
-#ifdef _WIN32
+//
+// Metro style applications cannot access Windows registry.
+//
+#if defined (_WIN32) && !defined(ICE_OS_WINRT)
     if(file.find("HKLM\\") == 0)
     {
         HKEY iceKey;
@@ -700,9 +703,12 @@ void
 Ice::PropertiesI::loadConfig()
 {
     string value = getProperty("Ice.Config");
+#ifndef ICE_OS_WINRT
+    //
+    // WinRT cannot access environment variables
     if(value.empty() || value == "1")
     {
-#ifdef _WIN32
+#   ifdef _WIN32
         vector<wchar_t> v(256);
         DWORD ret = GetEnvironmentVariableW(L"ICE_CONFIG", &v[0], static_cast<DWORD>(v.size()));
         if(ret >= v.size())
@@ -718,14 +724,15 @@ Ice::PropertiesI::loadConfig()
         {
             value = "";
         }
-#else
+#   else
        const char* s = getenv("ICE_CONFIG");
        if(s && *s != '\0')
        {
            value = s;
        }
-#endif
+#   endif
     }
+#endif
 
     if(!value.empty())
     {
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index 340dffdfa1a..aadf85a1114 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -12,11 +12,97 @@
 #include <Ice/Instance.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/LocalException.h>
+#include <IceUtil/Time.h>
 
 using namespace std;
 using namespace IceInternal;
 
-#if defined(ICE_USE_IOCP)
+#ifdef ICE_OS_WINRT
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+
+Selector::Selector(const InstancePtr& instance) : _instance(instance)
+{
+}
+
+void
+Selector::destroy()
+{
+}
+
+void
+Selector::initialize(IceInternal::EventHandler* handler)
+{
+    handler->__incRef();
+    handler->getNativeInfo()->setCompletedHandler(
+        ref new SocketOperationCompletedHandler([=](int operation)
+                                                {
+                                                    completed(handler, static_cast<SocketOperation>(operation));
+                                                }));
+}
+
+void
+Selector::update(IceInternal::EventHandler* handler, SocketOperation remove, SocketOperation add)
+{
+    handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
+    handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
+    if(add & SocketOperationRead && !(handler->_pending & SocketOperationRead))
+    {
+        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationRead);
+        completed(handler, SocketOperationRead); // Start an asynchrnous read 
+    }
+    else if(add & SocketOperationWrite && !(handler->_pending & SocketOperationWrite))
+    {
+        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationWrite);
+        completed(handler, SocketOperationWrite); // Start an asynchrnous write 
+    }
+}
+
+void
+Selector::finish(IceInternal::EventHandler* handler)
+{
+    handler->_registered = SocketOperationNone;
+    handler->__decRef();
+}
+
+IceInternal::EventHandler* 
+Selector::getNextHandler(SocketOperation& status, int timeout)
+{
+    Lock lock(*this);
+    while(_events.empty())
+    {
+        if(timeout > 0)
+        {
+            timedWait(IceUtil::Time::seconds(timeout));
+            if(_events.empty())
+            {
+                throw SelectorTimeoutException();  
+            }
+        }
+        else
+        {
+            wait();
+        }
+    }
+    assert(!_events.empty());
+    IceInternal::EventHandler* handler = _events.front().handler;
+    status = _events.front().status;
+    _events.pop_front();
+    return handler;
+}
+
+void 
+Selector::completed(IceInternal::EventHandler* handler, SocketOperation op)
+{
+    Lock lock(*this);
+    _events.push_back(SelectEvent(handler, op));
+    notify();
+}
+
+#elif defined(ICE_USE_IOCP)
+
 Selector::Selector(const InstancePtr& instance) : _instance(instance)
 {
 }
@@ -482,6 +568,7 @@ Selector::~Selector()
 void
 Selector::destroy()
 {
+    assert(_events.empty());
 }
 
 void
diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h
index 4c8b276abac..4ba45a9e4f3 100644
--- a/cpp/src/Ice/Selector.h
+++ b/cpp/src/Ice/Selector.h
@@ -26,6 +26,10 @@
 #   include <sys/poll.h>
 #endif
 
+#if defined(ICE_OS_WINRT)
+#    include <deque>
+#endif
+
 namespace IceInternal
 {
 
@@ -36,7 +40,41 @@ class SelectorTimeoutException
 {
 };
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_OS_WINRT)
+
+struct SelectEvent
+{
+    SelectEvent(IceInternal::EventHandler* handler, SocketOperation status) : handler(handler), status(status)
+    {
+    }
+
+    IceInternal::EventHandler* handler;
+    SocketOperation status;
+};
+
+class Selector : IceUtil::Monitor<IceUtil::Mutex>
+{
+public:
+
+    Selector(const InstancePtr&);
+
+    void destroy();
+
+    void initialize(IceInternal::EventHandler*);
+    void update(IceInternal::EventHandler*, SocketOperation, SocketOperation);    
+    void finish(IceInternal::EventHandler*);
+
+    IceInternal::EventHandler* getNextHandler(SocketOperation&, int);
+    
+    void completed(IceInternal::EventHandler*, SocketOperation);
+
+private:
+
+    const InstancePtr _instance;
+    std::deque<SelectEvent> _events;
+};
+
+#elif defined(ICE_USE_IOCP)
 
 class Selector
 {
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp
index 27a59ef47ad..0fc4fbc710c 100644
--- a/cpp/src/Ice/TcpAcceptor.cpp
+++ b/cpp/src/Ice/TcpAcceptor.cpp
@@ -12,7 +12,6 @@
 #include <Ice/Instance.h>
 #include <Ice/TraceLevels.h>
 #include <Ice/LoggerUtil.h>
-#include <Ice/Network.h>
 #include <Ice/Exception.h>
 #include <Ice/Properties.h>
 #include <IceUtil/StringUtil.h>
@@ -66,7 +65,7 @@ IceInternal::TcpAcceptor::listen()
         _fd = INVALID_SOCKET;
         throw;
     }
-
+    
     if(_traceLevels->network >= 1)
     {
         Trace out(_logger, _traceLevels->networkCat);
@@ -105,7 +104,7 @@ IceInternal::TcpAcceptor::startAccept()
     }        
 
     assert(_acceptFd == INVALID_SOCKET);
-    _acceptFd = createSocket(false, _addr.ss_family);
+    _acceptFd = createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
     if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, 
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
@@ -134,22 +133,19 @@ IceInternal::TcpAcceptor::finishAccept()
         _acceptError = _info.error;
     }
 }
+
 #endif
 
 TransceiverPtr
 IceInternal::TcpAcceptor::accept()
 {
-    SOCKET fd;
-#ifndef ICE_USE_IOCP
-    fd = doAccept(_fd);
-#else
+#ifdef ICE_USE_IOCP
     if(_acceptFd == INVALID_SOCKET)
     {
         SocketException ex(__FILE__, __LINE__);
         ex.error = _acceptError;
         throw ex;        
     }
-
     if(setsockopt(_acceptFd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char*)&_acceptFd, sizeof(_acceptFd)) == 
        SOCKET_ERROR)
     {
@@ -160,9 +156,12 @@ IceInternal::TcpAcceptor::accept()
         throw ex;        
     }
 
-    fd = _acceptFd;
+    SOCKET fd = _acceptFd;
     _acceptFd = INVALID_SOCKET;
+#else
+    SOCKET fd = doAccept(_fd);
 #endif
+
     if(_traceLevels->network >= 1)
     {
         Trace out(_logger, _traceLevels->networkCat);
@@ -183,7 +182,8 @@ IceInternal::TcpAcceptor::effectivePort() const
     return getPort(_addr);
 }
 
-IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string& host, int port, ProtocolSupport protocol) :
+IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string& host, int port, 
+                                      ProtocolSupport protocol) :
     _instance(instance),
     _traceLevels(instance->traceLevels()),
     _logger(instance->initializationData().logger),
@@ -199,10 +199,13 @@ IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string&
     _backlog = instance->initializationData().properties->getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
 #endif
 
-    _fd = createSocket(false, _addr.ss_family);
+
+    _fd = createSocket(false, _addr);
+
 #ifdef ICE_USE_IOCP
     _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
 #endif
+
     setBlock(_fd, false);
     setTcpBufSize(_fd, _instance->initializationData().properties, _logger);
 #ifndef _WIN32
@@ -220,12 +223,13 @@ IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string&
     //
     setReuseAddress(_fd, true);
 #endif
+    
     if(_traceLevels->network >= 2)
     {
         Trace out(_logger, _traceLevels->networkCat);
         out << "attempting to bind to tcp socket " << toString();
     }
-    const_cast<struct sockaddr_storage&>(_addr) = doBind(_fd, _addr);
+    const_cast<Address&>(_addr) = doBind(_fd, _addr);
 }
 
 IceInternal::TcpAcceptor::~TcpAcceptor()
@@ -235,3 +239,4 @@ IceInternal::TcpAcceptor::~TcpAcceptor()
     assert(_acceptFd == INVALID_SOCKET);
 #endif
 }
+
diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h
index 6d95d13f208..c54ae4dbb27 100644
--- a/cpp/src/Ice/TcpAcceptor.h
+++ b/cpp/src/Ice/TcpAcceptor.h
@@ -15,10 +15,7 @@
 #include <Ice/TraceLevelsF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/Acceptor.h>
-
-#ifndef _WIN32
-#   include <sys/socket.h> // For struct sockaddr_storage
-#endif
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
@@ -40,6 +37,7 @@ public:
     virtual void startAccept();
     virtual void finishAccept();
 #endif
+
     virtual TransceiverPtr accept();
     virtual std::string toString() const;
 
@@ -54,7 +52,7 @@ private:
     const InstancePtr _instance;
     const TraceLevelsPtr _traceLevels;
     const ::Ice::LoggerPtr _logger;
-    const struct sockaddr_storage _addr;
+    const Address _addr;
 
     int _backlog;
 #ifdef ICE_USE_IOCP
@@ -66,5 +64,5 @@ private:
 };
 
 }
-
 #endif
+
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 14f0ca81857..a3211c28eb7 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -31,7 +31,7 @@ IceInternal::TcpConnector::connect()
 
     try
     {
-        TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr.ss_family), false);
+        TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr), false);
         dynamic_cast<TcpTransceiver*>(transceiver.get())->connect(_addr);
         return transceiver;
     }
@@ -71,7 +71,7 @@ IceInternal::TcpConnector::operator==(const Connector& r) const
     {
         return false;
     }
-
+    
     if(_timeout != p->_timeout)
     {
         return false;
@@ -145,10 +145,10 @@ IceInternal::TcpConnector::operator<(const Connector& r) const
     {
         return false;
     }
-    return compareAddress(_addr, p->_addr) == -1;
+    return compareAddress(_addr, p->_addr) < 0;
 }
 
-IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr,
+IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const Address& addr,
                                         Ice::Int timeout, const Ice::ProtocolVersion& protocol, 
                                         const Ice::EncodingVersion& encoding, const string& connectionId) :
     _instance(instance),
diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h
index 33102409687..341696087ef 100644
--- a/cpp/src/Ice/TcpConnector.h
+++ b/cpp/src/Ice/TcpConnector.h
@@ -16,12 +16,7 @@
 #include <Ice/TraceLevelsF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/Connector.h>
-
-#ifdef _WIN32
-#   include <winsock2.h>
-#else
-#   include <sys/socket.h>
-#endif
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
@@ -41,7 +36,7 @@ public:
 
 private:
     
-    TcpConnector(const InstancePtr&, const struct sockaddr_storage&, Ice::Int, const Ice::ProtocolVersion&, 
+    TcpConnector(const InstancePtr&, const Address&, Ice::Int, const Ice::ProtocolVersion&, 
                  const Ice::EncodingVersion&, const std::string&);
     virtual ~TcpConnector();
     friend class TcpEndpointI;
@@ -49,7 +44,7 @@ private:
     const InstancePtr _instance;
     const TraceLevelsPtr _traceLevels;
     const ::Ice::LoggerPtr _logger;
-    const struct sockaddr_storage _addr;
+    const Address _addr;
     const Ice::Int _timeout;
     const Ice::ProtocolVersion _protocol;
     const Ice::EncodingVersion _encoding;
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index 5443b055328..e38885976fb 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -555,9 +555,9 @@ IceInternal::TcpEndpointI::hashInit() const
     hashAdd(h, _compress);
     return h;
 }
- 
+
 vector<ConnectorPtr>
-IceInternal::TcpEndpointI::connectors(const vector<struct sockaddr_storage>& addresses) const
+IceInternal::TcpEndpointI::connectors(const vector<Address>& addresses) const
 {
     vector<ConnectorPtr> connectors;
     for(unsigned int i = 0; i < addresses.size(); ++i)
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index d7774c73a49..c92f14c1374 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -10,8 +10,10 @@
 #ifndef ICE_TCP_ENDPOINT_I_H
 #define ICE_TCP_ENDPOINT_I_H
 
+#include <IceUtil/Config.h>
 #include <Ice/EndpointI.h>
 #include <Ice/EndpointFactory.h>
+#include <Ice/Network.h> // for IceIternal::Address
 
 namespace IceInternal
 {
@@ -49,7 +51,7 @@ public:
 private:
 
     virtual ::Ice::Int hashInit() const;
-    virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const;
+    virtual std::vector<ConnectorPtr> connectors(const std::vector<IceInternal::Address>&) const;
 
     //
     // All members are const, because endpoints are immutable.
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 6bb2794b7f1..3d59ae68bf1 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -14,7 +14,6 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/Stats.h>
 #include <Ice/Buffer.h>
-#include <Ice/Network.h>
 #include <Ice/LocalException.h>
 
 using namespace std;
@@ -56,10 +55,10 @@ IceInternal::TcpTransceiver::initialize()
     {
         try
         {
-#ifndef ICE_USE_IOCP
-            doFinishConnect(_fd);
-#else
+#if defined(ICE_USE_IOCP)
             doFinishConnectAsync(_fd, _write);
+#else
+            doFinishConnect(_fd);
 #endif
             _state = StateConnected;
             _desc = fdToString(_fd);
@@ -70,11 +69,11 @@ IceInternal::TcpTransceiver::initialize()
             {
                 Trace out(_logger, _traceLevels->networkCat);
                 out << "failed to establish tcp connection\n";
-#ifndef _WIN32
+#if !defined(_WIN32)
                 //
                 // The local address is only accessible with connected sockets on Windows.
                 //
-                struct sockaddr_storage localAddr;
+                Address localAddr;
                 fdToLocalAddress(_fd, localAddr);
                 out << "local address: " << addrToString(localAddr) << "\n";
 #else
@@ -122,8 +121,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
 {
     // Its impossible for the packetSize to be more than an Int.
     int packetSize = static_cast<int>(buf.b.end() - buf.i);
-    
-#ifdef ICE_USE_IOCP
+#   ifdef ICE_USE_IOCP
     //
     // Limit packet size to avoid performance problems on WIN32
     //
@@ -131,8 +129,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
     { 
         packetSize = _maxSendPacketSize;
     }
-#endif
-
+#   endif
     while(buf.i != buf.b.end())
     {
         assert(_fd != INVALID_SOCKET);
@@ -195,7 +192,6 @@ IceInternal::TcpTransceiver::write(Buffer& buf)
             packetSize = static_cast<int>(buf.b.end() - buf.i);
         }
     }
-
     return true;
 }
 
@@ -204,7 +200,6 @@ IceInternal::TcpTransceiver::read(Buffer& buf)
 {
     // Its impossible for the packetSize to be more than an Int.
     int packetSize = static_cast<int>(buf.b.end() - buf.i);
-    
     while(buf.i != buf.b.end())
     {
         assert(_fd != INVALID_SOCKET);
@@ -212,17 +207,6 @@ IceInternal::TcpTransceiver::read(Buffer& buf)
 
         if(ret == 0)
         {
-            //
-            // If the connection is lost when reading data, we shut
-            // down the write end of the socket. This helps to unblock
-            // threads that are stuck in send() or select() while
-            // sending data. Note: I don't really understand why
-            // send() or select() sometimes don't detect a connection
-            // loss. Therefore this helper to make them detect it.
-            //
-            //assert(_fd != INVALID_SOCKET);
-            //shutdownSocketReadWrite(_fd);
-            
             ConnectionLostException ex(__FILE__, __LINE__);
             ex.error = 0;
             throw ex;
@@ -248,14 +232,6 @@ IceInternal::TcpTransceiver::read(Buffer& buf)
             
             if(connectionLost())
             {
-                //
-                // See the commment above about shutting down the
-                // socket if the connection is lost while reading
-                // data.
-                //
-                //assert(_fd != INVALID_SOCKET);
-                //shutdownSocketReadWrite(_fd);
-            
                 ConnectionLostException ex(__FILE__, __LINE__);
                 ex.error = getSocketErrno();
                 throw ex;
@@ -283,11 +259,10 @@ IceInternal::TcpTransceiver::read(Buffer& buf)
 
         packetSize = static_cast<int>(buf.b.end() - buf.i);
     }
-
     return true;
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
 bool
 IceInternal::TcpTransceiver::startWrite(Buffer& buf)
 {
@@ -297,14 +272,15 @@ IceInternal::TcpTransceiver::startWrite(Buffer& buf)
         return false;
     }
 
-    assert(!buf.b.empty() && buf.i != buf.b.end());
+    assert(!buf.b.empty());
+    assert(buf.i != buf.b.end());
 
     int packetSize = static_cast<int>(buf.b.end() - buf.i);
     if(_maxSendPacketSize > 0 && packetSize > _maxSendPacketSize)
     { 
         packetSize = _maxSendPacketSize;
     }
-
+    assert(packetSize > 0);
     _write.buf.len = packetSize;
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
     int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, NULL);
@@ -362,6 +338,7 @@ IceInternal::TcpTransceiver::finishWrite(Buffer& buf)
             packetSize = _maxSendPacketSize;
         }
         Trace out(_logger, _traceLevels->networkCat);
+
         out << "sent " << _write.count << " of " << packetSize << " bytes via tcp\n" << toString();
     }
     
@@ -369,7 +346,6 @@ IceInternal::TcpTransceiver::finishWrite(Buffer& buf)
     {
         _stats->bytesSent(type(), _write.count);
     }
-
     buf.i += _write.count;
 }
 
@@ -381,7 +357,6 @@ IceInternal::TcpTransceiver::startRead(Buffer& buf)
     {
         packetSize = _maxReceivePacketSize;
     }
-
     assert(!buf.b.empty() && buf.i != buf.b.end());
 
     _read.buf.len = packetSize;
@@ -432,7 +407,7 @@ IceInternal::TcpTransceiver::finishRead(Buffer& buf)
         ex.error = 0;
         throw ex;
     }
-
+    
     if(_traceLevels->network >= 3)
     {
         int packetSize = static_cast<int>(buf.b.end() - buf.i);
@@ -496,6 +471,7 @@ IceInternal::TcpTransceiver::TcpTransceiver(const InstancePtr& instance, SOCKET
 #endif
 {
     setBlock(_fd, false);
+
     setTcpBufSize(_fd, instance->initializationData().properties, _logger);
 
 #ifdef ICE_USE_IOCP
@@ -524,9 +500,9 @@ IceInternal::TcpTransceiver::~TcpTransceiver()
 }
 
 void
-IceInternal::TcpTransceiver::connect(const struct sockaddr_storage& addr)
+IceInternal::TcpTransceiver::connect(const Address& addr)
 {
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP)
     try
     {
         if(doConnect(_fd, addr))
diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h
index 47e482d07ec..82099820416 100644
--- a/cpp/src/Ice/TcpTransceiver.h
+++ b/cpp/src/Ice/TcpTransceiver.h
@@ -15,6 +15,7 @@
 #include <Ice/LoggerF.h>
 #include <Ice/StatsF.h>
 #include <Ice/Transceiver.h>
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
@@ -37,7 +38,7 @@ public:
 #ifdef ICE_USE_IOCP
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
-
+    
     virtual SocketOperation initialize();
     virtual void close();
     virtual bool write(Buffer&);
@@ -58,7 +59,7 @@ private:
     TcpTransceiver(const InstancePtr&, SOCKET, bool);
     virtual ~TcpTransceiver();
 
-    void connect(const struct sockaddr_storage&);
+    void connect(const Address&);
 
     friend class TcpConnector;
     friend class TcpAcceptor;
@@ -69,7 +70,8 @@ private:
     
     State _state;
     std::string _desc;
-    struct sockaddr_storage _connectAddr;
+    Address _connectAddr;
+
 #ifdef ICE_USE_IOCP
     AsyncInfo _read;
     AsyncInfo _write;
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 9d4d9db3169..e1fd5ace7e6 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -8,14 +8,15 @@
 // **********************************************************************
 
 //
-// The following is required for GetThreadIOPendingFlag
+// The following is required to bring in some definitions. Don't
+// define with Metro Style apps.
 //
-#if defined(_WIN32) && !defined(_WIN32_WINNT)
-#  define _WIN32_WINNT 0x0501
+#if defined(_WIN32) && !defined(_WIN32_WINNT) && WINAPI_FAMILY != 0x02
+#       define _WIN32_WINNT 0x0501
 #endif
 
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/ThreadPool.h>
+#include <IceUtil/DisableWarnings.h>
 #include <Ice/EventHandler.h>
 #include <Ice/Network.h>
 #include <Ice/LocalException.h>
@@ -26,6 +27,10 @@
 #include <Ice/Properties.h>
 #include <Ice/TraceLevels.h>
 
+#if defined(ICE_OS_WINRT)
+#   include <IceUtil/Unicode.h>
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -157,11 +162,11 @@ IceInternal::ThreadPoolWorkQueue::ThreadPoolWorkQueue(ThreadPool* threadPool,
     _instance(instance),
     _selector(selector),
     _destroyed(false)
-#ifdef ICE_USE_IOCP
+#ifdef ICE_USE_IOCP 
     , _info(SocketOperationRead)
 #endif
 {
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     SOCKET fds[2];
     createPipe(fds);
     _fdIntrRead = fds[0];
@@ -176,7 +181,7 @@ IceInternal::ThreadPoolWorkQueue::~ThreadPoolWorkQueue()
 {
     assert(_destroyed);
 
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     try
     {
         closeSocket(_fdIntrRead);
@@ -217,7 +222,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
         throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
     _workItems.push_back(item);
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     if(_workItems.size() == 1)
     {
         postMessage();
@@ -227,7 +232,7 @@ IceInternal::ThreadPoolWorkQueue::queue(const ThreadPoolWorkItemPtr& item)
 #endif
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 IceInternal::ThreadPoolWorkQueue::startAsync(SocketOperation)
 {
@@ -254,18 +259,18 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
             workItem = _workItems.front();
             _workItems.pop_front();
 
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
             if(_workItems.empty())
             {
                 char c;
                 while(true)
                 {
                     ssize_t ret;
-#ifdef _WIN32
+#   ifdef _WIN32
                     ret = ::recv(_fdIntrRead, &c, 1, 0);
-#else
+#   else
                     ret = ::read(_fdIntrRead, &c, 1);
-#endif
+#   endif
                     if(ret == SOCKET_ERROR)
                     {
                         if(interrupted())
@@ -285,7 +290,7 @@ IceInternal::ThreadPoolWorkQueue::message(ThreadPoolCurrent& current)
         else
         {
             assert(_destroyed);
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
             postMessage();
 #endif
         }
@@ -317,24 +322,40 @@ IceInternal::ThreadPoolWorkQueue::toString() const
 NativeInfoPtr
 IceInternal::ThreadPoolWorkQueue::getNativeInfo()
 {
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     return new NativeInfo(_fdIntrRead);
-#endif
+#else
     return 0;
+#endif
 }
 
 void
 IceInternal::ThreadPoolWorkQueue::postMessage()
 {
-#ifndef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
+    if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this),
+#   if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
+                                   reinterpret_cast<LPOVERLAPPED>(&_info)
+#   else
+                                   &_info
+#   endif
+                                   ))
+    {
+        SocketException ex(__FILE__, __LINE__);
+        ex.error = GetLastError();
+        throw ex;
+    }
+#elif defined(ICE_OS_WINRT)
+    _selector.completed(this, SocketOperationRead);
+#else
     char c = 0;
     while(true)
     {
-#ifdef _WIN32
+#   ifdef _WIN32
         if(::send(_fdIntrWrite, &c, 1, 0) == SOCKET_ERROR)
-#else
+#   else
         if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
-#endif
+#   endif
         {
             if(interrupted())
             {
@@ -347,19 +368,6 @@ IceInternal::ThreadPoolWorkQueue::postMessage()
         }
         break;
     }
-#else
-    if(!PostQueuedCompletionStatus(_selector.getIOCPHandle(), 0, reinterpret_cast<ULONG_PTR>(this),
-#if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
-                                   reinterpret_cast<LPOVERLAPPED>(&_info)
-#else
-                                   &_info
-#endif
-                                   ))
-    {
-        SocketException ex(__FILE__, __LINE__);
-        ex.error = GetLastError();
-        throw ex;
-    }
 #endif
 }
 
@@ -379,21 +387,22 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     _threadIdleTime(0),
     _stackSize(0),
     _inUse(0),
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     _inUseIO(0),
     _nextHandler(_handlers.end()),
 #endif
     _promote(true)
 {
     PropertiesPtr properties = _instance->initializationData().properties;
-
-#ifdef _WIN32
+#ifndef ICE_OS_WINRT
+#   ifdef _WIN32
     SYSTEM_INFO sysInfo;
     GetSystemInfo(&sysInfo);
     int nProcessors = sysInfo.dwNumberOfProcessors;
-#else
+#   else
     int nProcessors = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
-#endif        
+#   endif        
+#endif
 
     //
     // We use just one thread as the default. This is the fastest
@@ -409,10 +418,12 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     }
 
     int sizeMax = properties->getPropertyAsIntWithDefault(_prefix + ".SizeMax", size);
+#ifndef ICE_OS_WINRT
     if(sizeMax == -1)
     {
         sizeMax = nProcessors;
     }
+#endif
     if(sizeMax < size)
     {
         Warning out(_instance->initializationData().logger);
@@ -445,7 +456,11 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     const_cast<int&>(_size) = size;
     const_cast<int&>(_sizeMax) = sizeMax;
     const_cast<int&>(_sizeWarn) = sizeWarn;
+#ifndef ICE_OS_WINRT
     const_cast<int&>(_sizeIO) = min(sizeMax, nProcessors);
+#else
+    const_cast<int&>(_sizeIO) = sizeMax;
+#endif
     const_cast<int&>(_threadIdleTime) = threadIdleTime;
 
 #ifdef ICE_USE_IOCP
@@ -460,7 +475,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
         stackSize = 0;
     }
     const_cast<size_t&>(_stackSize) = static_cast<size_t>(stackSize);
-
+    
     const_cast<bool&>(_hasPriority) = properties->getProperty(_prefix + ".ThreadPriority") != "";
     const_cast<int&>(_priority) = properties->getPropertyAsInt(_prefix + ".ThreadPriority");
     if(!_hasPriority)
@@ -468,7 +483,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
         const_cast<bool&>(_hasPriority) = properties->getProperty("Ice.ThreadPriority") != "";
         const_cast<int&>(_priority) = properties->getPropertyAsInt("Ice.ThreadPriority");
     }
-
+    
     _workQueue = new ThreadPoolWorkQueue(this, _instance, _selector);
 
     if(_instance->traceLevels()->threadPool >= 1)
@@ -550,7 +565,7 @@ IceInternal::ThreadPool::finish(const EventHandlerPtr& handler)
 {
     Lock sync(*this);
     assert(!_destroyed);
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     _selector.finish(handler.get()); // This must be called before!
     _workQueue->queue(new FinishedWorkItem(handler));
 
@@ -596,7 +611,7 @@ IceInternal::ThreadPool::joinWithAllThreads()
         (*p)->getThreadControl().join();
     }
 
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     _selector.finish(_workQueue.get());
 #endif
     _selector.destroy();
@@ -611,7 +626,7 @@ IceInternal::ThreadPool::prefix() const
 void
 IceInternal::ThreadPool::run(const IceUtil::ThreadPtr& thread)
 {
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     ThreadPoolCurrent current(_instance, this);
     bool select = false;
     vector<pair<EventHandler*, SocketOperation> > handlers;
@@ -633,6 +648,14 @@ IceInternal::ThreadPool::run(const IceUtil::ThreadPtr& thread)
                 out << "exception in `" << _prefix << "':\n" << ex << "\nevent handler: " 
                     << current._handler->toString();
             }
+#ifdef ICE_OS_WINRT
+            catch(Platform::Exception^ ex)
+            {
+                Error out(_instance->initializationData().logger);
+                out << "exception in `" << _prefix << "':\n" << IceUtil::wstringToString(ex->Message->Data())
+                    << "\nevent handler: " << current._handler->toString();
+            }
+#endif
             catch(...)
             {
                 Error out(_instance->initializationData().logger);
@@ -767,13 +790,14 @@ IceInternal::ThreadPool::run(const IceUtil::ThreadPtr& thread)
                 }
                 else if(_inUse < static_cast<int>(_threads.size() - 1)) // If not the last idle thread, we can exit.
                 {
+#ifndef ICE_OS_WINRT
                     BOOL hasIO = false;
                     GetThreadIOPendingFlag(GetCurrentThread(), &hasIO);
                     if(hasIO)
                     {
                         continue;
                     }
-
+#endif
                     if(_instance->traceLevels()->threadPool >= 1)
                     {
                         Trace out(_instance->initializationData().logger, _instance->traceLevels()->threadPoolCat);
@@ -782,7 +806,7 @@ IceInternal::ThreadPool::run(const IceUtil::ThreadPtr& thread)
                     _threads.erase(thread);
                     _workQueue->queue(new JoinThreadWorkItem(thread));
                     return;
-                }
+                }       
                 else if(_inUse > 0)
                 {
                     //
@@ -831,6 +855,14 @@ IceInternal::ThreadPool::run(const IceUtil::ThreadPtr& thread)
             Error out(_instance->initializationData().logger);
             out << "exception in `" << _prefix << "':\n" << ex << "\nevent handler: " << current._handler->toString();
         }
+#ifdef ICE_OS_WINRT
+        catch(Platform::Exception^ ex)
+        {
+            Error out(_instance->initializationData().logger);
+            out << "exception in `" << _prefix << "':\n" << IceUtil::wstringToString(ex->Message->Data())
+                << "\nevent handler: " << current._handler->toString();
+        }
+#endif
         catch(...)
         {
             Error out(_instance->initializationData().logger);
@@ -848,7 +880,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
     if(_sizeMax > 1)
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
         --_inUseIO;
         
         if(_serialize && !_destroyed)
@@ -915,7 +947,7 @@ IceInternal::ThreadPool::ioCompleted(ThreadPoolCurrent& current)
     return _serialize;
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 IceInternal::ThreadPool::startMessage(ThreadPoolCurrent& current)
 {
@@ -1133,7 +1165,7 @@ ThreadPoolCurrent::ThreadPoolCurrent(const InstancePtr& instance, const ThreadPo
     stream(instance.get(), Ice::currentProtocolEncoding), 
     _threadPool(threadPool.get()), 
     _ioCompleted(false)
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     , _leader(false)
 #endif
 {
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index f9e012980d6..3802d3a75e0 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -68,7 +68,7 @@ private:
 
     bool ioCompleted(ThreadPoolCurrent&);
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     bool startMessage(ThreadPoolCurrent&);
     void finishMessage(ThreadPoolCurrent&);
 #else
@@ -110,7 +110,7 @@ private:
 
     std::set<IceUtil::ThreadPtr> _threads; // All threads, running or not.
     int _inUse; // Number of threads that are currently in use.
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     int _inUseIO; // Number of threads that are currently performing IO.
     std::vector<std::pair<EventHandler*, SocketOperation> > _handlers;
     std::vector<std::pair<EventHandler*, SocketOperation> >::const_iterator _nextHandler;
@@ -133,7 +133,7 @@ public:
         return _threadPool->ioCompleted(const_cast<ThreadPoolCurrent&>(*this));
     }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     bool startMessage()
     {
         return _threadPool->startMessage(const_cast<ThreadPoolCurrent&>(*this));
@@ -150,7 +150,7 @@ private:
     ThreadPool* _threadPool;
     EventHandlerPtr _handler;
     bool _ioCompleted;
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
     bool _leader;
 #endif
     friend class ThreadPool;
@@ -186,7 +186,7 @@ public:
     void destroy();
     void queue(const ThreadPoolWorkItemPtr&);
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     bool startAsync(SocketOperation);
     bool finishAsync(SocketOperation);
 #endif
@@ -205,7 +205,7 @@ private:
     bool _destroyed;
 #ifdef ICE_USE_IOCP
     AsyncInfo _info;
-#else
+#elif !defined(ICE_OS_WINRT)
     SOCKET _fdIntrRead;
     SOCKET _fdIntrWrite;
 #endif
@@ -222,7 +222,7 @@ private:
 // the IOCP implementation and ensures that finishMessage isn't called multiple 
 // times.
 //
-#ifndef ICE_USE_IOCP
+#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_WINRT)
 template<class T> class ThreadPoolMessage
 {
 public:
diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index 655a9c42a32..3cf9b9d867a 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -29,7 +29,7 @@ public:
     virtual void close() = 0;
     virtual bool write(Buffer&) = 0;
     virtual bool read(Buffer&) = 0;
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&) = 0;
     virtual void finishWrite(Buffer&) = 0;
     virtual void startRead(Buffer&) = 0;
diff --git a/cpp/src/Ice/UdpConnector.cpp b/cpp/src/Ice/UdpConnector.cpp
index c12af491135..29782122b53 100644
--- a/cpp/src/Ice/UdpConnector.cpp
+++ b/cpp/src/Ice/UdpConnector.cpp
@@ -8,9 +8,9 @@
 // **********************************************************************
 
 #include <Ice/UdpConnector.h>
+
 #include <Ice/UdpTransceiver.h>
 #include <Ice/UdpEndpointI.h>
-#include <Ice/Network.h>
 #include <Ice/LocalException.h>
 
 using namespace std;
@@ -43,7 +43,6 @@ IceInternal::UdpConnector::operator==(const Connector& r) const
     {
         return false;
     }
-
     if(compareAddress(_addr, p->_addr) != 0)
     {
         return false;
@@ -136,12 +135,10 @@ IceInternal::UdpConnector::operator<(const Connector& r) const
     {
         return false;
     }
-
     return compareAddress(_addr, p->_addr) == -1;
 }
 
-
-IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr, 
+IceInternal::UdpConnector::UdpConnector(const InstancePtr& instance, const Address& addr, 
                                         const string& mcastInterface, int mcastTtl, 
                                         const Ice::ProtocolVersion& protocol, const Ice::EncodingVersion& encoding, 
                                         const std::string& connectionId) :
diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h
index 2c543b3f67d..148c767407b 100644
--- a/cpp/src/Ice/UdpConnector.h
+++ b/cpp/src/Ice/UdpConnector.h
@@ -14,12 +14,7 @@
 #include <Ice/InstanceF.h>
 #include <Ice/Connector.h>
 #include <Ice/Protocol.h>
-
-#ifdef _WIN32
-#   include <winsock2.h>
-#else
-#   include <sys/socket.h> // For struct sockaddr_storage
-#endif
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
@@ -39,13 +34,14 @@ public:
 
 private:
     
-    UdpConnector(const InstancePtr&, const struct sockaddr_storage&, const std::string&, int, 
+    UdpConnector(const InstancePtr&, const Address&, const std::string&, int, 
                  const Ice::ProtocolVersion&, const Ice::EncodingVersion&, const std::string&);
+
     virtual ~UdpConnector();
     friend class UdpEndpointI;
 
     const InstancePtr _instance;
-    struct sockaddr_storage _addr;
+    const Address _addr;
     const std::string _mcastInterface;
     const int _mcastTtl;
     const Ice::ProtocolVersion _protocol;
@@ -54,5 +50,4 @@ private:
 };
 
 }
-
 #endif
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index e17ab77dd58..f8dacf01d7a 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -644,7 +644,7 @@ IceInternal::UdpEndpointI::hashInit() const
 }
 
 vector<ConnectorPtr>
-IceInternal::UdpEndpointI::connectors(const vector<struct sockaddr_storage>& addresses) const
+IceInternal::UdpEndpointI::connectors(const vector<Address>& addresses) const
 {
     vector<ConnectorPtr> connectors;
     for(unsigned int i = 0; i < addresses.size(); ++i)
@@ -655,6 +655,7 @@ IceInternal::UdpEndpointI::connectors(const vector<struct sockaddr_storage>& add
     return connectors;
 }
 
+
 IceInternal::UdpEndpointFactory::UdpEndpointFactory(const InstancePtr& instance)
     : _instance(instance)
 {
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index c95cd83b18e..c82ef8aa2fb 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -10,8 +10,10 @@
 #ifndef ICE_UDP_ENDPOINT_I_H
 #define ICE_UDP_ENDPOINT_I_H
 
+#include <IceUtil/Config.h>
 #include <Ice/EndpointI.h>
 #include <Ice/EndpointFactory.h>
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
@@ -49,7 +51,7 @@ public:
 private:
 
     virtual ::Ice::Int hashInit() const;
-    virtual std::vector<ConnectorPtr> connectors(const std::vector<struct sockaddr_storage>&) const;
+    virtual std::vector<ConnectorPtr> connectors(const std::vector<IceInternal::Address>&) const;
 
     //
     // All members are const, because endpoints are immutable.
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 198a2f7c4f1..855527b144d 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -7,14 +7,6 @@
 //
 // **********************************************************************
 
-//
-// The following is required for the Vista PSDK to bring in
-// the definitions of the IN6_IS_ADDR_* macros.
-//
-#if defined(_WIN32) && !defined(_WIN32_WINNT)
-#       define _WIN32_WINNT 0x0501
-#endif
-
 #include <Ice/UdpTransceiver.h>
 #include <Ice/Connection.h>
 #include <Ice/Instance.h>
@@ -22,14 +14,24 @@
 #include <Ice/LoggerUtil.h>
 #include <Ice/Stats.h>
 #include <Ice/Buffer.h>
-#include <Ice/Network.h>
 #include <Ice/LocalException.h>
 #include <Ice/Properties.h>
 #include <IceUtil/StringUtil.h>
 
+#ifdef ICE_OS_WINRT
+#   include <ppltasks.h> // For Concurrency::task
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
+#ifdef ICE_OS_WINRT
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+#endif
 
 NativeInfoPtr
 IceInternal::UdpTransceiver::getNativeInfo()
@@ -53,6 +55,26 @@ IceInternal::UdpTransceiver::getAsyncInfo(SocketOperation status)
         return 0;
     }
 }
+#elif defined(ICE_OS_WINRT)
+void 
+IceInternal::UdpTransceiver::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+{
+    _completedHandler = handler;
+    _writeOperationCompletedHandler = ref new AsyncOperationCompletedHandler<unsigned int>(
+        [=] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
+        {
+            if(status != Windows::Foundation::AsyncStatus::Completed)
+            {
+                _write.count = SOCKET_ERROR;
+                _write.error = operation->ErrorCode.Value;
+            }
+            else
+            {
+                _write.count = static_cast<int>(operation->GetResults());
+            }
+            _completedHandler(SocketOperationWrite);
+        });
+}
 #endif
 
 SocketOperation
@@ -67,7 +89,16 @@ IceInternal::UdpTransceiver::initialize()
     {
         try
         {
+#if defined(ICE_USE_IOCP)
+            doFinishConnectAsync(_fd, _write);
+#elif defined(ICE_OS_WINRT)
+            if(_write.count == SOCKET_ERROR)
+            {
+                checkConnectErrorCode(__FILE__, __LINE__, _write.error, _addr.host);
+            }
+#else
             doFinishConnect(_fd);
+#endif
             _state = StateConnected;
         }
         catch(const Ice::LocalException& ex)
@@ -102,6 +133,17 @@ IceInternal::UdpTransceiver::close()
         out << "closing udp connection\n" << toString();
     }
 
+#ifdef ICE_OS_WINRT
+    IceUtil::Mutex::Lock lock(_mutex);
+    if(_readPending)
+    {
+        assert(_received.empty());
+        _completedHandler(SocketOperationRead);
+        _readPending = false;
+    }
+    _received.clear();
+#endif
+
     assert(_fd != INVALID_SOCKET);
     closeSocket(_fd);
     _fd = INVALID_SOCKET;
@@ -110,6 +152,9 @@ IceInternal::UdpTransceiver::close()
 bool
 IceInternal::UdpTransceiver::write(Buffer& buf)
 {
+#ifdef ICE_OS_WINRT
+    return false;
+#else
     assert(buf.i == buf.b.begin());
     assert(_fd != INVALID_SOCKET && _state >= StateConnected);
 
@@ -121,11 +166,11 @@ repeat:
     ssize_t ret;
     if(_state == StateConnected)
     {
-#ifdef _WIN32
+#   ifdef _WIN32
         ret = ::send(_fd, reinterpret_cast<const char*>(&buf.b[0]), static_cast<int>(buf.b.size()), 0);
-#else
+#   else
         ret = ::send(_fd, reinterpret_cast<const char*>(&buf.b[0]), buf.b.size(), 0);
-#endif
+#   endif
     }
     else
     {
@@ -146,13 +191,13 @@ repeat:
             throw ex;
         }
 
-#ifdef _WIN32
+#   ifdef _WIN32
         ret = ::sendto(_fd, reinterpret_cast<const char*>(&buf.b[0]), static_cast<int>(buf.b.size()), 0, 
                        reinterpret_cast<struct sockaddr*>(&_peerAddr), len);
-#else
+#   else
         ret = ::sendto(_fd, reinterpret_cast<const char*>(&buf.b[0]), buf.b.size(), 0,
                        reinterpret_cast<struct sockaddr*>(&_peerAddr), len);
-#endif
+#   endif
     }
 
     if(ret == SOCKET_ERROR)
@@ -186,11 +231,15 @@ repeat:
     assert(ret == static_cast<ssize_t>(buf.b.size()));
     buf.i = buf.b.end();
     return true;
+#endif
 }
 
 bool
 IceInternal::UdpTransceiver::read(Buffer& buf)
 {
+#ifdef ICE_OS_WINRT
+    return false;
+#else
     assert(buf.i == buf.b.begin());
     assert(_fd != INVALID_SOCKET);
 
@@ -265,12 +314,12 @@ repeat:
         //
         assert(_incoming); // Client connections should always be connected at this point.
 
-#ifndef NDEBUG
+#   ifndef NDEBUG
         bool connected = doConnect(_fd, _peerAddr);
         assert(connected);
-#else
+#   else
         doConnect(_fd, _peerAddr);
-#endif
+#   endif
         _state = StateConnected;
 
         if(_traceLevels->network >= 1)
@@ -294,9 +343,10 @@ repeat:
     buf.b.resize(ret);
     buf.i = buf.b.end();
     return true;
+#endif
 }
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
 bool
 IceInternal::UdpTransceiver::startWrite(Buffer& buf)
 {
@@ -304,9 +354,138 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
 
     // The caller is supposed to check the send size before by calling checkSendSize
     assert(min(_maxPacketSize, _sndSize - _udpOverhead) >= static_cast<int>(buf.b.size()));
-
     assert(_fd != INVALID_SOCKET);
 
+#ifdef ICE_OS_WINRT
+    if(_state < StateConnected)
+    {
+        try
+        {
+            bool multicast = isMulticast(_addr) || isAddressValid(_mcastAddr);
+            if(!multicast)
+            {
+                auto operation = safe_cast<DatagramSocket^>(_fd)->ConnectAsync(_addr.host, _addr.port);
+                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
+                {
+                    operation->Completed = ref new AsyncActionCompletedHandler(
+                        [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
+                        {
+                            if(status != Windows::Foundation::AsyncStatus::Completed)
+                            {
+                                _write.count = SOCKET_ERROR;
+                                _write.error = info->ErrorCode.Value;
+                            }
+                            else
+                            {
+                                _write.count = 0;
+                                _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
+                            }
+                            _completedHandler(SocketOperationConnect);
+                        });
+                }
+                else
+                {
+                    _write.count = 0;
+                    _writer = ref new DataWriter(safe_cast<DatagramSocket^>(_fd)->OutputStream);
+                }
+            }
+            else
+            {
+                auto operation = safe_cast<DatagramSocket^>(_fd)->GetOutputStreamAsync(_addr.host, _addr.port);
+                if(!checkIfErrorOrCompleted(SocketOperationConnect, operation))
+                {
+                    operation->Completed = ref new AsyncOperationCompletedHandler<IOutputStream^>(
+                        [=] (IAsyncOperation<IOutputStream^>^ info, Windows::Foundation::AsyncStatus status)
+                        {
+                            if(status != Windows::Foundation::AsyncStatus::Completed)
+                            {
+                                _write.count = SOCKET_ERROR;
+                                _write.error = info->ErrorCode.Value;
+                            }
+                            else
+                            {
+                                _write.count = 0;
+                                _writer = ref new DataWriter(info->GetResults());
+                            }
+                            if(_mcastAddr.host != nullptr)
+                            {
+                                setMcastGroup(_fd, _mcastAddr, "");
+                            }
+                            _completedHandler(SocketOperationConnect);
+                        });
+                }
+                else
+                {
+                    _write.count = 0;
+                    _writer = ref new DataWriter(operation->GetResults());
+                    setMcastGroup(_fd, _mcastAddr, "");
+                }
+            }
+        }
+        catch(Platform::Exception^ ex)
+        {
+            checkConnectErrorCode(__FILE__, __LINE__, ex->HResult, _addr.host);
+        }
+        return false;
+    }
+    else if(_state == StateNotConnected)
+    {
+        try
+        {
+            DatagramSocket^ fd = safe_cast<DatagramSocket^>(_fd);
+            concurrency::create_task(fd->GetOutputStreamAsync(_peerAddr.host, _peerAddr.port)).then(
+                [=,&buf](concurrency::task<IOutputStream^> task)
+                {
+                    try
+                    {
+                        DataWriter^ writer = ref new DataWriter(task.get());
+                        writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
+                        DataWriterStoreOperation^ operation = writer->StoreAsync();
+                        if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
+                        {
+                            _write.count = operation->GetResults();
+                        }
+                        else
+                        {
+                            operation->Completed = _writeOperationCompletedHandler;
+                        }
+                    }
+                    catch(Platform::Exception^ pex)
+                    {
+                        _write.count = SOCKET_ERROR;
+                        _write.error = pex->HResult;
+                        _completedHandler(SocketOperationWrite);
+                    }
+                });
+        }
+        catch(Platform::Exception^ ex)
+        {
+            checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        }
+        return true;
+    }
+    else
+    {
+        try
+        {
+            _writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<int>(buf.b.size())));
+            DataWriterStoreOperation^ operation = _writer->StoreAsync();
+            if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
+            {
+                _write.count = operation->GetResults();
+            }
+            else
+            {
+                operation->Completed = _writeOperationCompletedHandler;
+            }
+        }
+        catch(Platform::Exception^ ex)
+        {
+            checkErrorCode(__FILE__, __LINE__, ex->HResult);
+        }
+        return true;
+    }
+#else
     _write.buf.len = static_cast<int>(buf.b.size());
     _write.buf.buf = reinterpret_cast<char*>(&*buf.i);
     int err;
@@ -354,14 +533,21 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf)
             }
         }
     }
+#endif
     return true;
 }
 
 void
 IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
 {
+    if(_state < StateConnected)
+    {
+        return;
+    }
+
     if(_write.count == SOCKET_ERROR)
     {
+#ifndef ICE_OS_WINRT
         WSASetLastError(_write.error);
         if(connectionLost())
         {
@@ -375,6 +561,9 @@ IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
             ex.error = getSocketErrno();
             throw ex;
         }
+#else
+        checkErrorCode(__FILE__, __LINE__, _write.error);
+#endif
     }
 
     if(_traceLevels->network >= 3)
@@ -388,7 +577,7 @@ IceInternal::UdpTransceiver::finishWrite(Buffer& buf)
         _stats->bytesSent(type(), static_cast<Int>(_write.count));
     }
 
-    assert(_write.count == static_cast<ssize_t>(buf.b.size()));
+    assert(_write.count == buf.b.size());
     buf.i = buf.b.end();
 }
 
@@ -398,9 +587,8 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
     const int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
     buf.b.resize(packetSize);
     buf.i = buf.b.begin();
-
     assert(!buf.b.empty() && buf.i != buf.b.end());
-
+#ifndef ICE_OS_WINRT
     _read.buf.len = packetSize;
     _read.buf.buf = reinterpret_cast<char*>(&*buf.i);
     int err;
@@ -439,11 +627,54 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf)
             }
         }
     }
+#else
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_readPending);
+    if(!_received.empty())
+    {
+        _completedHandler(SocketOperationRead);
+    }
+    else
+    {
+        _readPending = true;
+    }
+#endif
 }
 
 void
 IceInternal::UdpTransceiver::finishRead(Buffer& buf)
 {
+#ifdef ICE_OS_WINRT
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_readPending && (!_received.empty() || _fd == INVALID_SOCKET));
+    if(_fd == INVALID_SOCKET)
+    {
+        return;
+    }
+
+    DatagramSocketMessageReceivedEventArgs^ args = _received.front();
+    _received.pop_front();
+
+    int ret;
+    try
+    {
+        DataReader^ reader = args->GetDataReader();
+        ret = min(static_cast<int>(reader->UnconsumedBufferLength), static_cast<int>(buf.b.size())); // Truncate received data if too large.
+        
+        Array<unsigned char>^ data = ref new Array<unsigned char>(ret);
+        reader->ReadBytes(data);
+        memcpy(&*buf.i, data->Data, ret);
+        if(_state == StateNotConnected)
+        {
+            _peerAddr.host = args->RemoteAddress;
+            _peerAddr.port = args->RemotePort;
+        }
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+#else
     if(_read.count == SOCKET_ERROR)
     {
         WSASetLastError(_read.error);
@@ -477,18 +708,21 @@ IceInternal::UdpTransceiver::finishRead(Buffer& buf)
         _peerAddr = _readAddr;
     }
 
+    int ret = _read.count;
+#endif
+
     if(_traceLevels->network >= 3)
     {
         Trace out(_logger, _traceLevels->networkCat);
-        out << "received " << _read.count << " bytes via udp\n" << toString();
+        out << "received " << ret << " bytes via udp\n" << toString();
     }
 
     if(_stats)
     {
-        _stats->bytesReceived(type(), static_cast<Int>(_read.count));
+        _stats->bytesReceived(type(), static_cast<Int>(ret));
     }
 
-    buf.b.resize(_read.count);
+    buf.b.resize(ret);
     buf.i = buf.b.end();
 }
 #endif
@@ -510,20 +744,27 @@ IceInternal::UdpTransceiver::toString() const
     ostringstream s;
     if(_state == StateNotConnected)
     {
-        struct sockaddr_storage localAddr;
+        Address localAddr;
         fdToLocalAddress(_fd, localAddr);
         s << "local address = " << addrToString(localAddr);
-        if(_peerAddr.ss_family != AF_UNSPEC)
+        if(isAddressValid(_peerAddr))
         {
             s << "\nremote address = " << addrToString(_peerAddr);
         }
     }
     else
     {
+#ifndef ICE_OS_WINRT
         s << fdToString(_fd);
+#else
+        Address localAddr;
+        fdToLocalAddress(_fd, localAddr);
+        s << "local address = " << addrToString(localAddr);
+        s << "\nremote address = " << addrToString(_addr);
+#endif
     }
 
-    if(_mcastAddr.ss_family != AF_UNSPEC)
+    if(isAddressValid(_mcastAddr))
     {
         s << "\nmulticast address = " + addrToString(_mcastAddr);
     }
@@ -533,14 +774,23 @@ IceInternal::UdpTransceiver::toString() const
 Ice::ConnectionInfoPtr
 IceInternal::UdpTransceiver::getInfo() const
 {
-    assert(_fd != INVALID_SOCKET);
     Ice::UDPConnectionInfoPtr info = new Ice::UDPConnectionInfo();
+#if defined(ICE_OS_WINRT)
+    if(isMulticast(_addr) || isAddressValid(_mcastAddr))
+    {
+        info->remotePort = 0;
+        info->localPort = 0;
+        info->mcastPort = 0;
+        return info;
+    }
+#endif
+    assert(_fd != INVALID_SOCKET);
     if(_state == StateNotConnected)
     {
-        struct sockaddr_storage localAddr;
+        Address localAddr;
         fdToLocalAddress(_fd, localAddr);
         addrToAddressAndPort(localAddr, info->localAddress, info->localPort);
-        if(_peerAddr.ss_family != AF_UNSPEC)
+        if(isAddressValid(_peerAddr))
         {
             addrToAddressAndPort(_peerAddr, info->remoteAddress, info->remotePort);
         }
@@ -554,7 +804,7 @@ IceInternal::UdpTransceiver::getInfo() const
         fdToAddressAndPort(_fd, info->localAddress, info->localPort, info->remoteAddress, info->remotePort);   
     }
 
-    if(_mcastAddr.ss_family != AF_UNSPEC)
+    if(isAddressValid(_mcastAddr))
     {
         addrToAddressAndPort(_mcastAddr, info->mcastAddress, info->mcastPort);
     }
@@ -590,26 +840,32 @@ IceInternal::UdpTransceiver::effectivePort() const
     return getPort(_addr);
 }
 
-IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const struct sockaddr_storage& addr,
-                                            const string& mcastInterface, int mcastTtl) :
+
+IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, 
+                                            const Address& addr,
+                                            const string& mcastInterface,
+                                            int mcastTtl) :
     _traceLevels(instance->traceLevels()),
     _logger(instance->initializationData().logger),
     _stats(instance->initializationData().stats),
     _incoming(false),
     _addr(addr),
     _state(StateNeedConnect)
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
     , _read(SocketOperationRead), 
     _write(SocketOperationWrite)
+#elif defined(ICE_OS_WINRT)
+    , _readPending(false)
 #endif
 {
-    _mcastAddr.ss_family = AF_UNSPEC; // AF_UNSPEC means not multicast.
-    _peerAddr.ss_family = AF_UNSPEC; // Not initialized yet.
-
-    _fd = createSocket(true, _addr.ss_family);
+    _fd = createSocket(true, _addr);
     setBufSize(instance);
     setBlock(_fd, false);
-    
+
+#ifndef ICE_OS_WINRT
+    _mcastAddr.ss_family = AF_UNSPEC;
+    _peerAddr.ss_family = AF_UNSPEC; // Not initialized yet.
+
     //
     // In general, connecting a datagram socket should be non-blocking as this just setups 
     // the default destination address for the socket. However, on some OS, connect sometime
@@ -621,28 +877,36 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     {
         _state = StateConnected;
     }
-
-#ifdef ICE_USE_IOCP
-    //
-    // On Windows when using IOCP, we must make sure that the socket is connected without 
-    // blocking as there's no way to do a non-blocking datagram socket conection (ConnectEx
-    // only supports connection oriented sockets). According to Microsoft documentation of
-    // the connect() call, this should always be the case.
-    //
-    assert(_state == StateConnected);
+#else
+    DatagramSocket^ socket = safe_cast<DatagramSocket^>(_fd);
+    socket->MessageReceived += ref new TypedEventHandler<DatagramSocket^, DatagramSocketMessageReceivedEventArgs^>(
+        [=](DatagramSocket^ fd, DatagramSocketMessageReceivedEventArgs^ args)
+        {
+            this->appendMessage(args);
+        });
 #endif
-    
+
     if(isMulticast(_addr))
     {
         if(mcastInterface.length() > 0)
         {
-            setMcastInterface(_fd, mcastInterface, _addr.ss_family == AF_INET);
+            setMcastInterface(_fd, mcastInterface, _addr);
         }
         if(mcastTtl != -1)
         {
-            setMcastTtl(_fd, mcastTtl, _addr.ss_family == AF_INET);
+            setMcastTtl(_fd, mcastTtl, _addr);
         }
     }
+
+#ifdef ICE_USE_IOCP
+    //
+    // On Windows when using IOCP, we must make sure that the socket is connected without 
+    // blocking as there's no way to do a non-blocking datagram socket conection (ConnectEx
+    // only supports connection oriented sockets). According to Microsoft documentation of
+    // the connect() call, this should always be the case.
+    //
+    assert(_state == StateConnected);
+#endif
 }
 
 IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const string& host, int port,
@@ -653,25 +917,37 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
     _incoming(true),
     _addr(getAddressForServer(host, port, instance->protocolSupport())),
     _state(connect ? StateNeedConnect : StateNotConnected)
-#ifdef ICE_USE_IOCP
+#ifdef ICE_OS_WINRT
+    , _readPending(false)
+#elif defined(ICE_USE_IOCP)
     , _read(SocketOperationRead), 
     _write(SocketOperationWrite)
 #endif
 {
+    _fd = createSocket(true, _addr);
+    setBufSize(instance);
+    setBlock(_fd, false);
+
+#ifndef ICE_OS_WINRT
     memset(&_mcastAddr, 0, sizeof(_mcastAddr));
     memset(&_peerAddr, 0, sizeof(_peerAddr));
+    _peerAddr.ss_family = AF_UNSPEC;
+    _mcastAddr.ss_family = AF_UNSPEC;
+#else
+    DatagramSocket^ socket = safe_cast<DatagramSocket^>(_fd);
+    socket->MessageReceived += ref new TypedEventHandler<DatagramSocket^, DatagramSocketMessageReceivedEventArgs^>(
+        [=](DatagramSocket^ fd, DatagramSocketMessageReceivedEventArgs^ args)
+        {
+            this->appendMessage(args);
+        });
+#endif
 
-    _fd = createSocket(true, _addr.ss_family);
-    setBufSize(instance);
-    setBlock(_fd, false);
     if(_traceLevels->network >= 2)
     {
         Trace out(_logger, _traceLevels->networkCat);
         out << "attempting to bind to udp socket " << addrToString(_addr);
     }
 
-    _peerAddr.ss_family = AF_UNSPEC; // Not assigned yet.
-
     if(isMulticast(_addr))
     {
         setReuseAddress(_fd, true);
@@ -685,11 +961,10 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
         // address won't be the multicast address and the client will
         // therefore reject the datagram.
         //
-        const_cast<struct sockaddr_storage&>(_addr) = 
-            getAddressForServer("", port, _mcastAddr.ss_family == AF_INET ? EnableIPv4 : EnableIPv6);
+        const_cast<Address&>(_addr) = getAddressForServer("", port, getProtocolSupport(_addr));
 #endif
 
-        const_cast<struct sockaddr_storage&>(_addr) = doBind(_fd, _addr);
+        const_cast<Address&>(_addr) = doBind(_fd, _addr);
         if(getPort(_mcastAddr) == 0)
         {
             setPort(_mcastAddr, getPort(_addr));
@@ -713,16 +988,14 @@ IceInternal::UdpTransceiver::UdpTransceiver(const InstancePtr& instance, const s
         //
         setReuseAddress(_fd, true);
 #endif
-        const_cast<struct sockaddr_storage&>(_addr) = doBind(_fd, _addr);
-
-        _mcastAddr.ss_family = AF_UNSPEC; // AF_UNSPEC means not multicast.
+        const_cast<Address&>(_addr) = doBind(_fd, _addr);
     }
 
     if(_traceLevels->network >= 1)
     {
         Trace out(_logger, _traceLevels->networkCat);
         out << "starting to receive udp packets\n" << toString();
-        
+
         vector<string> interfaces = 
             getHostsForEndpointExpand(inetAddrToString(_addr), instance->protocolSupport(), true);
         if(!interfaces.empty())
@@ -741,7 +1014,6 @@ IceInternal::UdpTransceiver::~UdpTransceiver()
 //
 // Set UDP receive and send buffer sizes.
 //
-
 void
 IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
 {
@@ -759,7 +1031,6 @@ IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
             prop = "Ice.UDP.RcvSize";
             addr = &_rcvSize;
             dfltSize = getRecvBufferSize(_fd);
-            _rcvSize = dfltSize;
         }
         else
         {
@@ -767,9 +1038,14 @@ IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
             prop = "Ice.UDP.SndSize";
             addr = &_sndSize;
             dfltSize = getSendBufferSize(_fd);
-            _sndSize = dfltSize;
         }
 
+        if(dfltSize <= 0)
+        {
+            dfltSize = _maxPacketSize;
+        }
+        *addr = dfltSize;
+
         //
         // Get property for buffer size and check for sanity.
         //
@@ -802,7 +1078,11 @@ IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
             //
             // Warn if the size that was set is less than the requested size.
             //
-            if(*addr < sizeRequested)
+            if(*addr == 0) // set buffer size not supported.
+            {
+                *addr = sizeRequested;
+            }
+            else if(*addr < sizeRequested)
             {
                 Warning out(_logger);
                 out << "UDP " << direction << " buffer size: requested size of "
@@ -812,6 +1092,68 @@ IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
     }
 }
 
+#ifdef ICE_OS_WINRT
+bool
+IceInternal::UdpTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info)
+{
+    //
+    // NOTE: It's important to only check for info->Status once as it
+    // might change during the checks below (the Status can be changed
+    // by the Windows thread pool concurrently).
+    //
+    // We consider that a canceled async status is the same as an
+    // error. A canceled async status can occur if there's a timeout
+    // and the socket is closed.
+    //
+    Windows::Foundation::AsyncStatus status = info->Status;
+    if(status == Windows::Foundation::AsyncStatus::Completed)
+    {
+        _completedHandler(op);
+        return true;
+    }
+    else if(status == Windows::Foundation::AsyncStatus::Started)
+    {
+        return false;
+    }
+    else
+    {
+        if(_state < StateConnected)
+        {
+            checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _addr.host);
+        }
+        else 
+        {
+            checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
+        }
+        return true; // Prevent compiler warning.
+    }
+}
+
+void
+IceInternal::UdpTransceiver::appendMessage(DatagramSocketMessageReceivedEventArgs^ args)
+{
+    IceUtil::Mutex::Lock lock(_mutex);
+    if(_fd == INVALID_SOCKET) // Transceiver was closed.
+    {
+        return;
+    }
+    _received.push_back(args);
+
+    //
+    // If the transceiver is waiting to read a message, notify the
+    // selector that the transceiver is ready for read. This will in
+    // turn cause finishRead() to be called. If the transceiver is
+    // ready for read, we just queue the message. It will be picked
+    // up by startRead() when it is invoked.
+    //
+    if(_readPending)
+    {
+        _completedHandler(SocketOperationRead);
+        _readPending = false;
+    }
+}
+#endif
+
 //
 // The maximum IP datagram size is 65535. Subtract 20 bytes for the IP header and 8 bytes for the UDP header
 // to get the maximum payload.
diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h
index df764db8b60..0a1fc7155ba 100644
--- a/cpp/src/Ice/UdpTransceiver.h
+++ b/cpp/src/Ice/UdpTransceiver.h
@@ -10,20 +10,17 @@
 #ifndef ICE_UDP_TRANSCEIVER_H
 #define ICE_UDP_TRANSCEIVER_H
 
-#ifdef __hpux
-#   define _XOPEN_SOURCE_EXTENDED
-#endif
-
 #include <Ice/InstanceF.h>
 #include <Ice/TraceLevelsF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/StatsF.h>
 #include <Ice/Transceiver.h>
 #include <Ice/Protocol.h>
+#include <Ice/Network.h>
 #include <IceUtil/Mutex.h>
 
-#ifndef _WIN32
-#   include <sys/socket.h> // For struct sockaddr_storage
+#ifdef ICE_OS_WINRT
+#   include <deque>
 #endif
 
 namespace IceInternal
@@ -31,8 +28,6 @@ namespace IceInternal
 
 class UdpEndpoint;
 
-class SUdpTransceiver;
-
 class UdpTransceiver : public Transceiver, public NativeInfo
 {
     enum State
@@ -46,15 +41,17 @@ class UdpTransceiver : public Transceiver, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
+#elif defined(ICE_OS_WINRT)
+    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
 #endif
 
     virtual SocketOperation initialize();
     virtual void close();
     virtual bool write(Buffer&);
     virtual bool read(Buffer&);
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);
@@ -69,12 +66,19 @@ public:
 
 private:
 
-    UdpTransceiver(const InstancePtr&, const struct sockaddr_storage&, const std::string&, int);
+    UdpTransceiver(const InstancePtr&, const Address&, const std::string&, int);
     UdpTransceiver(const InstancePtr&, const std::string&, int, const std::string&, bool);
+
     virtual ~UdpTransceiver();
 
     void setBufSize(const InstancePtr&);
 
+#ifdef ICE_OS_WINRT
+    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^);
+    void appendMessage(Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^);
+    Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^ readMessage();
+#endif
+
     friend class UdpEndpointI;
     friend class UdpConnector;
 
@@ -82,24 +86,35 @@ private:
     const Ice::LoggerPtr _logger;
     const Ice::StatsPtr _stats;
     const bool _incoming;
-    const struct sockaddr_storage _addr;
-    struct sockaddr_storage _mcastAddr;
-    struct sockaddr_storage _peerAddr;
-    
+
+    const Address _addr;
+    Address _mcastAddr;
+    Address _peerAddr;
+
     State _state;
     int _rcvSize;
     int _sndSize;
     static const int _udpOverhead;
     static const int _maxPacketSize;
 
-#ifdef ICE_USE_IOCP
+#if defined(ICE_USE_IOCP)
     AsyncInfo _read;
     AsyncInfo _write;
-    struct sockaddr_storage _readAddr;
+    Address _readAddr;
     socklen_t _readAddrLen;
+#elif defined(ICE_OS_WINRT)
+    AsyncInfo _write;
+
+    Windows::Storage::Streams::DataWriter^ _writer;
+
+    SocketOperationCompletedHandler^ _completedHandler;
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
+
+    IceUtil::Mutex _mutex;
+    bool _readPending;
+    std::deque<Windows::Networking::Sockets::DatagramSocketMessageReceivedEventArgs^> _received;
 #endif
 };
 
 }
-
 #endif
diff --git a/cpp/src/Ice/winrt/.depend.mak b/cpp/src/Ice/winrt/.depend.mak
new file mode 100644
index 00000000000..0f456b64331
--- /dev/null
+++ b/cpp/src/Ice/winrt/.depend.mak
@@ -0,0 +1,146 @@
+$(ARCH)\$(CONFIG)\Acceptor$(OBJEXT): ..\Acceptor.cpp "..\..\Ice\Acceptor.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\AcceptorF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h"
+$(ARCH)\$(CONFIG)\Base64$(OBJEXT): ..\Base64.cpp "..\..\Ice\Base64.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h"
+$(ARCH)\$(CONFIG)\Buffer$(OBJEXT): ..\Buffer.cpp "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h"
+$(ARCH)\$(CONFIG)\BasicStream$(OBJEXT): ..\BasicStream.cpp "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ProxyFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\ProxyFactory.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\ObjectFactory.h" "..\..\Ice\ObjectFactoryManager.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "..\..\Ice\TraceUtil.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h"
+$(ARCH)\$(CONFIG)\BuiltinSequences$(OBJEXT): ..\BuiltinSequences.cpp "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\CommunicatorI$(OBJEXT): ..\CommunicatorI.cpp "$(includedir)\IceUtil\DisableWarnings.h" "..\..\Ice\CommunicatorI.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\Instance.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\ConnectionFactory.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Network.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\EndpointI.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\Reference.h" "..\..\Ice\SharedContext.h" "..\..\Ice\ProxyFactory.h" "..\..\Ice\ObjectFactoryManager.h" "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\GC.h" "$(includedir)\Ice\Router.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\IceUtil\UUID.h"
+$(ARCH)\$(CONFIG)\Communicator$(OBJEXT): ..\Communicator.cpp "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ConnectRequestHandler$(OBJEXT): ..\ConnectRequestHandler.cpp "..\..\Ice\ConnectRequestHandler.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\RequestHandler.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\RouterInfo.h" "..\..\Ice\ConnectionRequestHandler.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Network.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\ConnectionFactory$(OBJEXT): ..\ConnectionFactory.cpp "..\..\Ice\ConnectionFactory.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\ConnectionI.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\EndpointI.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\DefaultsAndOverrides.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\Transceiver.h" "..\..\Ice\Connector.h" "..\..\Ice\Acceptor.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\Reference.h" "$(includedir)\Ice\RouterF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "$(includedir)\IceUtil\Random.h"
+$(ARCH)\$(CONFIG)\ConnectionI$(OBJEXT): ..\ConnectionI.cpp "$(includedir)\IceUtil\DisableWarnings.h" "..\..\Ice\ConnectionI.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\TraceUtil.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\Transceiver.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "..\..\Ice\ConnectionMonitor.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\EndpointI.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\Reference.h" "$(includedir)\Ice\RouterF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\ProxyFactory.h"
+$(ARCH)\$(CONFIG)\ConnectionMonitor$(OBJEXT): ..\ConnectionMonitor.cpp "..\..\Ice\ConnectionMonitor.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\ConnectionMonitorF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\InstanceF.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Plugin.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\Direct.h"
+$(ARCH)\$(CONFIG)\Connection$(OBJEXT): ..\Connection.cpp "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Connector$(OBJEXT): ..\Connector.cpp "..\..\Ice\Connector.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "..\..\Ice\TransceiverF.h"
+$(ARCH)\$(CONFIG)\ConnectionRequestHandler$(OBJEXT): ..\ConnectionRequestHandler.cpp "..\..\Ice\ConnectionRequestHandler.h" "..\..\Ice\RequestHandler.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\RouterInfo.h"
+$(ARCH)\$(CONFIG)\Current$(OBJEXT): ..\Current.cpp "$(includedir)\Ice\Current.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\DefaultsAndOverrides$(OBJEXT): ..\DefaultsAndOverrides.cpp "..\..\Ice\DefaultsAndOverrides.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\DefaultsAndOverridesF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\Network.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\LocalException.h"
+$(ARCH)\$(CONFIG)\Direct$(OBJEXT): ..\Direct.cpp "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\ServantManager.h" "$(includedir)\Ice\ServantLocator.h" "..\..\Ice\Reference.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\RouterF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\LocalException.h"
+$(ARCH)\$(CONFIG)\DispatchInterceptor$(OBJEXT): ..\DispatchInterceptor.cpp "$(includedir)\Ice\DispatchInterceptor.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\IncomingRequest.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h"
+$(ARCH)\$(CONFIG)\DynamicLibrary$(OBJEXT): ..\DynamicLibrary.cpp "$(includedir)\Ice\DynamicLibrary.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\EndpointFactoryManager$(OBJEXT): ..\EndpointFactoryManager.cpp "..\..\Ice\EndpointFactoryManager.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\OpaqueEndpointI.h" "..\..\Ice\EndpointI.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\DefaultsAndOverrides.h"
+$(ARCH)\$(CONFIG)\EndpointFactory$(OBJEXT): ..\EndpointFactory.cpp "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\EndpointFactoryF.h" "$(includedir)\Ice\Protocol.h"
+$(ARCH)\$(CONFIG)\Endpoint$(OBJEXT): ..\Endpoint.cpp "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\EndpointI$(OBJEXT): ..\EndpointI.cpp "..\..\Ice\EndpointI.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\PropertiesI.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\EndpointTypes$(OBJEXT): ..\EndpointTypes.cpp "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\EventHandler$(OBJEXT): ..\EventHandler.cpp "..\..\Ice\EventHandler.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h"
+$(ARCH)\$(CONFIG)\Exception$(OBJEXT): ..\Exception.cpp "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\Unicode.h"
+$(ARCH)\$(CONFIG)\FacetMap$(OBJEXT): ..\FacetMap.cpp "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\FactoryTable$(OBJEXT): ..\FactoryTable.cpp "$(includedir)\Ice\FactoryTable.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h"
+$(ARCH)\$(CONFIG)\FactoryTableInit$(OBJEXT): ..\FactoryTableInit.cpp "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\GC$(OBJEXT): ..\GC.cpp "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\GC.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h"
+$(ARCH)\$(CONFIG)\Identity$(OBJEXT): ..\Identity.cpp "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ImplicitContextI$(OBJEXT): ..\ImplicitContextI.cpp "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\ImplicitContext$(OBJEXT): ..\ImplicitContext.cpp "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\IncomingAsync$(OBJEXT): ..\IncomingAsync.cpp "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\ServantLocator.h" "..\..\Ice\ConnectionI.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\ReplyStatus.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\Incoming$(OBJEXT): ..\Incoming.cpp "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\IncomingAsync.h" "..\..\Ice\IncomingRequest.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ServantLocator.h" "..\..\Ice\ServantManager.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\ReplyStatus.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\Initialize$(OBJEXT): ..\Initialize.cpp "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\IceUtil\ArgVector.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\GC.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "..\..\Ice\CommunicatorI.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\PropertiesI.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\StreamI.h" "..\..\Ice\LoggerI.h" "$(includedir)\Ice\Logger.h" "$(includedir)\IceUtil\FileUtil.h" "..\..\Ice\Instance.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\Instance$(OBJEXT): ..\Instance.cpp "$(includedir)\IceUtil\DisableWarnings.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ProxyFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\DefaultsAndOverrides.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\Router.h" "..\..\Ice\LocatorInfo.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\Reference.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\ProxyFactory.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Network.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "..\..\Ice\ConnectionFactory.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\EndpointI.h" "..\..\Ice\ConnectionMonitor.h" "..\..\Ice\ObjectFactoryManager.h" "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "..\..\Ice\PropertiesI.h" "..\..\Ice\LoggerI.h" "$(includedir)\Ice\Logger.h" "$(includedir)\IceUtil\FileUtil.h" "..\..\Ice\EndpointFactoryManager.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\RetryQueue.h" "$(includedir)\Ice\DynamicLibrary.h" "..\..\Ice\PluginManagerI.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\IceUtil\UUID.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\IceUtil\MutexPtrLock.h" "..\..\Ice\UdpEndpointI.h" "$(includedir)\Ice\EndpointFactory.h" "StreamEndpointI.h"
+$(ARCH)\$(CONFIG)\LocalException$(OBJEXT): ..\LocalException.cpp "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\LocalObject$(OBJEXT): ..\LocalObject.cpp "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h"
+$(ARCH)\$(CONFIG)\LocatorInfo$(OBJEXT): ..\LocatorInfo.cpp "..\..\Ice\LocatorInfo.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "..\..\Ice\LocatorInfoF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\EndpointI.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Reference.h" "$(includedir)\Ice\RouterF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h"
+$(ARCH)\$(CONFIG)\Locator$(OBJEXT): ..\Locator.cpp "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\LoggerI$(OBJEXT): ..\LoggerI.cpp "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\LoggerI.h" "$(includedir)\Ice\Logger.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\FileUtil.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\LocalException.h"
+$(ARCH)\$(CONFIG)\Logger$(OBJEXT): ..\Logger.cpp "$(includedir)\Ice\Logger.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\LoggerUtil$(OBJEXT): ..\LoggerUtil.cpp "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Logger.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h"
+$(ARCH)\$(CONFIG)\Network$(OBJEXT): ..\Network.cpp "..\..\Ice\Network.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\InputUtil.h"
+$(ARCH)\$(CONFIG)\ObjectAdapterFactory$(OBJEXT): ..\ObjectAdapterFactory.cpp "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "$(includedir)\IceUtil\UUID.h"
+$(ARCH)\$(CONFIG)\ObjectAdapterI$(OBJEXT): ..\ObjectAdapterI.cpp "$(includedir)\IceUtil\UUID.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\ConnectionMonitor.h" "..\..\Ice\ProxyFactory.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\Reference.h" "$(includedir)\Ice\RouterF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\EndpointI.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\EndpointFactoryManager.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\ConnectionFactory.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "..\..\Ice\EventHandler.h" "..\..\Ice\ServantManager.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "..\..\Ice\LocatorInfo.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Router.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\PropertyNames.h"
+$(ARCH)\$(CONFIG)\ObjectAdapter$(OBJEXT): ..\ObjectAdapter.cpp "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ObjectFactoryManager$(OBJEXT): ..\ObjectFactoryManager.cpp "..\..\Ice\ObjectFactoryManager.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h"
+$(ARCH)\$(CONFIG)\ObjectFactory$(OBJEXT): ..\ObjectFactory.cpp "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Object$(OBJEXT): ..\Object.cpp "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\IncomingAsync.h" "..\..\Ice\IncomingRequest.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h"
+$(ARCH)\$(CONFIG)\OpaqueEndpointI$(OBJEXT): ..\OpaqueEndpointI.cpp "..\..\Ice\OpaqueEndpointI.h" "..\..\Ice\EndpointI.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\Base64.h" "..\..\Ice\HashUtil.h"
+$(ARCH)\$(CONFIG)\OutgoingAsync$(OBJEXT): ..\OutgoingAsync.cpp "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\RequestHandler.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\LocatorInfo.h" "..\..\Ice\ProxyFactory.h" "..\..\Ice\RouterInfo.h" "..\..\Ice\ReplyStatus.h" "..\..\Ice\ThreadPool.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "..\..\Ice\RetryQueue.h"
+$(ARCH)\$(CONFIG)\Outgoing$(OBJEXT): ..\Outgoing.cpp "$(includedir)\Ice\Outgoing.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\RequestHandler.h" "$(includedir)\Ice\OutgoingAsyncF.h" "..\..\Ice\ConnectionI.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ServantManagerF.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\ReplyStatus.h"
+$(ARCH)\$(CONFIG)\PluginManagerI$(OBJEXT): ..\PluginManagerI.cpp "..\..\Ice\PluginManagerI.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\DynamicLibrary.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h"
+$(ARCH)\$(CONFIG)\Plugin$(OBJEXT): ..\Plugin.cpp "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Process$(OBJEXT): ..\Process.cpp "$(includedir)\Ice\Process.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\PropertiesI$(OBJEXT): ..\PropertiesI.cpp "..\..\Ice\PropertiesI.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\FileUtil.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\PropertyNames.h" "$(includedir)\Ice\Logger.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h"
+$(ARCH)\$(CONFIG)\Properties$(OBJEXT): ..\Properties.cpp "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\PropertyNames$(OBJEXT): ..\PropertyNames.cpp "..\..\Ice\PropertyNames.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h"
+$(ARCH)\$(CONFIG)\Protocol$(OBJEXT): ..\Protocol.cpp "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h"
+$(ARCH)\$(CONFIG)\ProtocolPluginFacade$(OBJEXT): ..\ProtocolPluginFacade.cpp "$(includedir)\Ice\ProtocolPluginFacade.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\ProtocolPluginFacadeF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointFactoryF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\Protocol.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ProxyFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\EndpointFactoryManager.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\DefaultsAndOverrides.h" "$(includedir)\Ice\Endpoint.h"
+$(ARCH)\$(CONFIG)\ProxyFactory$(OBJEXT): ..\ProxyFactory.cpp "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\ProxyFactory.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\Reference.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\LocatorInfo.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\TraceLevels.h"
+$(ARCH)\$(CONFIG)\Proxy$(OBJEXT): ..\Proxy.cpp "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "..\..\Ice\ProxyFactory.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\ConnectRequestHandler.h" "..\..\Ice\RequestHandler.h" "..\..\Ice\RouterInfo.h" "..\..\Ice\ConnectionRequestHandler.h" "..\..\Ice\EndpointI.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Process.h" "..\..\Ice\LocatorInfo.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "..\..\Ice\EventHandler.h"
+$(ARCH)\$(CONFIG)\ReferenceFactory$(OBJEXT): ..\ReferenceFactory.cpp "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\ReferenceFactory.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "..\..\Ice\ProxyFactory.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\EndpointI.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EndpointFactoryManager.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\Router.h" "..\..\Ice\LocatorInfo.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\PropertyNames.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\Reference$(OBJEXT): ..\Reference.cpp "..\..\Ice\Reference.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\ReferenceFactory.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "..\..\Ice\EndpointI.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\OpaqueEndpointI.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\RouterInfo.h" "$(includedir)\Ice\Router.h" "..\..\Ice\LocatorInfo.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "..\..\Ice\ConnectionI.h" "$(includedir)\Ice\Connection.h" "..\..\Ice\EventHandler.h" "..\..\Ice\ConnectionFactory.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\TraceLevels.h" "..\..\Ice\HashUtil.h" "..\..\Ice\DefaultsAndOverrides.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\Random.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\RetryQueue$(OBJEXT): ..\RetryQueue.cpp "..\..\Ice\RetryQueue.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h"
+$(ARCH)\$(CONFIG)\RequestHandler$(OBJEXT): ..\RequestHandler.cpp "..\..\Ice\RequestHandler.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\LocalObjectF.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h"
+$(ARCH)\$(CONFIG)\RouterInfo$(OBJEXT): ..\RouterInfo.cpp "..\..\Ice\RouterInfo.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "..\..\Ice\RouterInfoF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Router.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\Functional.h" "$(includedir)\IceUtil\Functional.h" "..\..\Ice\Reference.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\LocatorF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\SharedContext.h" "$(includedir)\Ice\Properties.h"
+$(ARCH)\$(CONFIG)\Router$(OBJEXT): ..\Router.cpp "$(includedir)\Ice\Router.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Selector$(OBJEXT): ..\Selector.cpp "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\Network.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\ThreadPoolF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h"
+$(ARCH)\$(CONFIG)\ServantLocator$(OBJEXT): ..\ServantLocator.cpp "$(includedir)\Ice\ServantLocator.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ServantManager$(OBJEXT): ..\ServantManager.cpp "..\..\Ice\ServantManager.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\ServantLocator.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\Plugin.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\Direct.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\SliceChecksumDict$(OBJEXT): ..\SliceChecksumDict.cpp "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\SliceChecksums$(OBJEXT): ..\SliceChecksums.cpp "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\Stats$(OBJEXT): ..\Stats.cpp "$(includedir)\Ice\Stats.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\StreamI$(OBJEXT): ..\StreamI.cpp "..\..\Ice\StreamI.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\Ice\LocalException.h"
+$(ARCH)\$(CONFIG)\Stream$(OBJEXT): ..\Stream.cpp "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Object.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h"
+$(ARCH)\$(CONFIG)\StringConverter$(OBJEXT): ..\StringConverter.cpp "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Config.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\IceUtil.h" "$(includedir)\IceUtil\AbstractMutex.h" "$(includedir)\IceUtil\Cache.h" "$(includedir)\IceUtil\CountDownLatch.h" "$(includedir)\IceUtil\CtrlCHandler.h" "$(includedir)\IceUtil\Functional.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\UUID.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\Dispatcher.h" "..\..\Ice\Instance.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Communicator.h" "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\Properties.h"
+$(ARCH)\$(CONFIG)\ThreadPool$(OBJEXT): ..\ThreadPool.cpp "..\..\Ice\ThreadPool.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\EventHandler.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\Network.h" "..\..\Ice\Selector.h" "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\LoggerUtil.h" "..\..\Ice\ObjectAdapterFactory.h" "..\..\Ice\ObjectAdapterI.h" "$(includedir)\Ice\ObjectAdapter.h" "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\Endpoint.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\Properties.h" "..\..\Ice\TraceLevels.h"
+$(ARCH)\$(CONFIG)\TraceLevels$(OBJEXT): ..\TraceLevels.cpp "..\..\Ice\TraceLevels.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h"
+$(ARCH)\$(CONFIG)\TraceUtil$(OBJEXT): ..\TraceUtil.cpp "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\IceUtil\StringUtil.h" "..\..\Ice\TraceUtil.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "$(includedir)\Ice\ProxyFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\Logger.h" "..\..\Ice\ReplyStatus.h"
+$(ARCH)\$(CONFIG)\Transceiver$(OBJEXT): ..\Transceiver.cpp "..\..\Ice\Transceiver.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h"
+$(ARCH)\$(CONFIG)\UdpConnector$(OBJEXT): ..\UdpConnector.cpp "..\..\Ice\UdpConnector.h" "..\..\Ice\TransceiverF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "..\..\Ice\Connector.h" "..\..\Ice\ConnectorF.h" "$(includedir)\Ice\Protocol.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "..\..\Ice\UdpTransceiver.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "..\..\Ice\UdpEndpointI.h" "..\..\Ice\EndpointI.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\AcceptorF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "$(includedir)\Ice\LocalException.h"
+$(ARCH)\$(CONFIG)\UdpEndpointI$(OBJEXT): ..\UdpEndpointI.cpp "..\..\Ice\UdpEndpointI.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\EndpointI.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\UdpConnector.h" "..\..\Ice\Connector.h" "..\..\Ice\UdpTransceiver.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\HashUtil.h"
+$(ARCH)\$(CONFIG)\UdpTransceiver$(OBJEXT): ..\UdpTransceiver.cpp "..\..\Ice\UdpTransceiver.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ConnectionF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Stats.h" "$(includedir)\Ice\Properties.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\StreamAcceptor$(OBJEXT): .\StreamAcceptor.cpp "StreamAcceptor.h" "..\..\Ice\TransceiverF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "..\..\Ice\Acceptor.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\EventHandlerF.h" "StreamTransceiver.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Properties.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\StreamConnector$(OBJEXT): .\StreamConnector.cpp "StreamConnector.h" "..\..\Ice\TransceiverF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\InstanceF.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "..\..\Ice\Connector.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\EventHandlerF.h" "StreamTransceiver.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "StreamEndpointI.h" "..\..\Ice\EndpointI.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\AcceptorF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h"
+$(ARCH)\$(CONFIG)\StreamEndpointI$(OBJEXT): .\StreamEndpointI.cpp "StreamEndpointI.h" "$(includedir)\IceUtil\Config.h" "..\..\Ice\EndpointI.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\Handle.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\TransceiverF.h" "..\..\Ice\ConnectorF.h" "..\..\Ice\AcceptorF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LoggerF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\EndpointFactory.h" "$(includedir)\Ice\EndpointFactoryF.h" "StreamAcceptor.h" "..\..\Ice\TraceLevelsF.h" "..\..\Ice\Acceptor.h" "StreamConnector.h" "..\..\Ice\Connector.h" "StreamTransceiver.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "$(includedir)\Ice\LocalException.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\DefaultsAndOverrides.h" "..\..\Ice\HashUtil.h"
+$(ARCH)\$(CONFIG)\StreamTransceiver$(OBJEXT): .\StreamTransceiver.cpp "StreamTransceiver.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "..\..\Ice\TraceLevelsF.h" "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\StatsF.h" "..\..\Ice\Transceiver.h" "..\..\Ice\TransceiverF.h" "$(includedir)\Ice\ConnectionF.h" "..\..\Ice\Network.h" "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "..\..\Ice\EventHandlerF.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "..\..\Ice\Instance.h" "$(includedir)\IceUtil\RecMutex.h" "..\..\Ice\DefaultsAndOverridesF.h" "..\..\Ice\RouterInfoF.h" "..\..\Ice\LocatorInfoF.h" "..\..\Ice\ReferenceFactoryF.h" "..\..\Ice\ThreadPoolF.h" "$(includedir)\Ice\ConnectionFactoryF.h" "$(includedir)\Ice\ConnectionMonitorF.h" "..\..\Ice\ObjectFactoryManagerF.h" "$(includedir)\Ice\ObjectAdapterFactoryF.h" "..\..\Ice\EndpointFactoryManagerF.h" "..\..\Ice\RetryQueueF.h" "$(includedir)\Ice\DynamicLibraryF.h" "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\Initialize.h" "$(includedir)\Ice\Dispatcher.h" "$(includedir)\Ice\StringConverter.h" "$(includedir)\Ice\Plugin.h" "$(includedir)\IceUtil\Unicode.h" "..\..\Ice\ImplicitContextI.h" "$(includedir)\Ice\ImplicitContext.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\FacetMap.h" "$(includedir)\Ice\Process.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "..\..\Ice\TraceLevels.h" "$(includedir)\Ice\LoggerUtil.h" "$(includedir)\Ice\Stats.h" "$(includedir)\Ice\Properties.h"
+$(ARCH)\$(CONFIG)\EndpointInfo$(OBJEXT): .\EndpointInfo.cpp "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ConnectionInfo$(OBJEXT): .\ConnectionInfo.cpp "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Connection.h" "$(includedir)\Ice\Endpoint.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\CommunicatorF$(OBJEXT): ..\CommunicatorF.cpp "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ConnectionF$(OBJEXT): ..\ConnectionF.cpp "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\EndpointF$(OBJEXT): ..\EndpointF.cpp "$(includedir)\Ice\EndpointF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ImplicitContextF$(OBJEXT): ..\ImplicitContextF.cpp "$(includedir)\Ice\ImplicitContextF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\LocatorF$(OBJEXT): ..\LocatorF.cpp "$(includedir)\Ice\LocatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\LoggerF$(OBJEXT): ..\LoggerF.cpp "$(includedir)\Ice\LoggerF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ObjectAdapterF$(OBJEXT): ..\ObjectAdapterF.cpp "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ObjectFactoryF$(OBJEXT): ..\ObjectFactoryF.cpp "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\PluginF$(OBJEXT): ..\PluginF.cpp "$(includedir)\Ice\PluginF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ProcessF$(OBJEXT): ..\ProcessF.cpp "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\PropertiesF$(OBJEXT): ..\PropertiesF.cpp "$(includedir)\Ice\PropertiesF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\RouterF$(OBJEXT): ..\RouterF.cpp "$(includedir)\Ice\RouterF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\ServantLocatorF$(OBJEXT): ..\ServantLocatorF.cpp "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\StatsF$(OBJEXT): ..\StatsF.cpp "$(includedir)\Ice\StatsF.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+
+$(headerdir)\Ice\BuiltinSequences.h ..\BuiltinSequences.cpp: "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\CommunicatorF.h ..\CommunicatorF.cpp: "$(slicedir)\Ice\CommunicatorF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Communicator.h ..\Communicator.cpp: "$(slicedir)\Ice\Communicator.ice" "$(slicedir)\Ice\LoggerF.ice" "$(slicedir)\Ice\StatsF.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\ObjectFactoryF.ice" "$(slicedir)\Ice\RouterF.ice" "$(slicedir)\Ice\LocatorF.ice" "$(slicedir)\Ice\PluginF.ice" "$(slicedir)\Ice\ImplicitContextF.ice" "$(slicedir)\Ice\Current.ice" "$(slicedir)\Ice\ConnectionF.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ConnectionF.h ..\ConnectionF.cpp: "$(slicedir)\Ice\ConnectionF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Connection.h ..\Connection.cpp: "$(slicedir)\Ice\Connection.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\Endpoint.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Current.h ..\Current.cpp: "$(slicedir)\Ice\Current.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\ConnectionF.ice" "$(slicedir)\Ice\Identity.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Endpoint.h ..\Endpoint.cpp: "$(slicedir)\Ice\Endpoint.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\EndpointF.h ..\EndpointF.cpp: "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\EndpointTypes.h ..\EndpointTypes.cpp: "$(slicedir)\Ice\EndpointTypes.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\FacetMap.h ..\FacetMap.cpp: "$(slicedir)\Ice\FacetMap.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Identity.h ..\Identity.cpp: "$(slicedir)\Ice\Identity.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ImplicitContextF.h ..\ImplicitContextF.cpp: "$(slicedir)\Ice\ImplicitContextF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ImplicitContext.h ..\ImplicitContext.cpp: "$(slicedir)\Ice\ImplicitContext.ice" "$(slicedir)\Ice\LocalException.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Current.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\ConnectionF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\LocalException.h ..\LocalException.cpp: "$(slicedir)\Ice\LocalException.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\LocatorF.h ..\LocatorF.cpp: "$(slicedir)\Ice\LocatorF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Locator.h ..\Locator.cpp: "$(slicedir)\Ice\Locator.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\ProcessF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\LoggerF.h ..\LoggerF.cpp: "$(slicedir)\Ice\LoggerF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Logger.h ..\Logger.cpp: "$(slicedir)\Ice\Logger.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ObjectAdapterF.h ..\ObjectAdapterF.cpp: "$(slicedir)\Ice\ObjectAdapterF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ObjectAdapter.h ..\ObjectAdapter.cpp: "$(slicedir)\Ice\ObjectAdapter.ice" "$(slicedir)\Ice\CommunicatorF.ice" "$(slicedir)\Ice\ServantLocatorF.ice" "$(slicedir)\Ice\LocatorF.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\FacetMap.ice" "$(slicedir)\Ice\Endpoint.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ObjectFactoryF.h ..\ObjectFactoryF.cpp: "$(slicedir)\Ice\ObjectFactoryF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ObjectFactory.h ..\ObjectFactory.cpp: "$(slicedir)\Ice\ObjectFactory.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\PluginF.h ..\PluginF.cpp: "$(slicedir)\Ice\PluginF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Plugin.h ..\Plugin.cpp: "$(slicedir)\Ice\Plugin.ice" "$(slicedir)\Ice\LoggerF.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ProcessF.h ..\ProcessF.cpp: "$(slicedir)\Ice\ProcessF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Process.h ..\Process.cpp: "$(slicedir)\Ice\Process.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\PropertiesF.h ..\PropertiesF.cpp: "$(slicedir)\Ice\PropertiesF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Properties.h ..\Properties.cpp: "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\RouterF.h ..\RouterF.cpp: "$(slicedir)\Ice\RouterF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Router.h ..\Router.cpp: "$(slicedir)\Ice\Router.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ServantLocatorF.h ..\ServantLocatorF.cpp: "$(slicedir)\Ice\ServantLocatorF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\ServantLocator.h ..\ServantLocator.cpp: "$(slicedir)\Ice\ServantLocator.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\Current.ice" "$(slicedir)\Ice\ConnectionF.ice" "$(slicedir)\Ice\Identity.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\SliceChecksumDict.h ..\SliceChecksumDict.cpp: "$(slicedir)\Ice\SliceChecksumDict.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\StatsF.h ..\StatsF.cpp: "$(slicedir)\Ice\StatsF.ice" "$(SLICE2CPP)"
+$(headerdir)\Ice\Stats.h ..\Stats.cpp: "$(slicedir)\Ice\Stats.ice" "$(SLICE2CPP)"
+
+$(headerdir)\IceSSL\EndpointInfo.h .\EndpointInfo.cpp: "$(slicedir)\IceSSL\EndpointInfo.ice" "$(slicedir)\Ice\Endpoint.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+$(headerdir)\IceSSL\ConnectionInfo.h .\ConnectionInfo.cpp: "$(slicedir)\IceSSL\ConnectionInfo.ice" "$(slicedir)\Ice\Connection.ice" "$(slicedir)\Ice\ObjectAdapterF.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\Endpoint.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\EndpointF.ice" "$(SLICE2CPP)"
+
diff --git a/cpp/src/Ice/winrt/.gitignore b/cpp/src/Ice/winrt/.gitignore
new file mode 100644
index 00000000000..1b4414f868b
--- /dev/null
+++ b/cpp/src/Ice/winrt/.gitignore
@@ -0,0 +1,2 @@
+ConnectionInfo.cpp
+EndpointInfo.cpp
+\ No newline at end of file
diff --git a/cpp/src/Ice/winrt/Makefile.mak b/cpp/src/Ice/winrt/Makefile.mak
new file mode 100644
index 00000000000..14e374b8710
--- /dev/null
+++ b/cpp/src/Ice/winrt/Makefile.mak
@@ -0,0 +1,272 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir		= ..\..\..
+LIBNAME		= $(SDK_LIBRARY_PATH)\ice.lib
+TARGETS		= $(LIBNAME)
+SOURCE_DIR	= ..
+
+OBJS		= $(ARCH)\$(CONFIG)\Acceptor.obj \
+                  $(ARCH)\$(CONFIG)\Base64.obj \
+		  $(ARCH)\$(CONFIG)\Buffer.obj \
+		  $(ARCH)\$(CONFIG)\BasicStream.obj \
+		  $(ARCH)\$(CONFIG)\BuiltinSequences.obj \
+		  $(ARCH)\$(CONFIG)\CommunicatorI.obj \
+		  $(ARCH)\$(CONFIG)\Communicator.obj \
+		  $(ARCH)\$(CONFIG)\ConnectRequestHandler.obj \
+		  $(ARCH)\$(CONFIG)\ConnectionFactory.obj \
+		  $(ARCH)\$(CONFIG)\ConnectionI.obj \
+		  $(ARCH)\$(CONFIG)\ConnectionMonitor.obj \
+		  $(ARCH)\$(CONFIG)\Connection.obj \
+		  $(ARCH)\$(CONFIG)\Connector.obj \
+		  $(ARCH)\$(CONFIG)\ConnectionRequestHandler.obj \
+		  $(ARCH)\$(CONFIG)\Current.obj \
+		  $(ARCH)\$(CONFIG)\DefaultsAndOverrides.obj \
+		  $(ARCH)\$(CONFIG)\Direct.obj \
+                  $(ARCH)\$(CONFIG)\DispatchInterceptor.obj \
+		  $(ARCH)\$(CONFIG)\DynamicLibrary.obj \
+		  $(ARCH)\$(CONFIG)\EndpointFactoryManager.obj \
+		  $(ARCH)\$(CONFIG)\EndpointFactory.obj \
+		  $(ARCH)\$(CONFIG)\Endpoint.obj \
+		  $(ARCH)\$(CONFIG)\EndpointI.obj \
+		  $(ARCH)\$(CONFIG)\EndpointTypes.obj \
+		  $(ARCH)\$(CONFIG)\EventHandler.obj \
+		  $(ARCH)\$(CONFIG)\Exception.obj \
+		  $(ARCH)\$(CONFIG)\FacetMap.obj \
+		  $(ARCH)\$(CONFIG)\FactoryTable.obj \
+		  $(ARCH)\$(CONFIG)\FactoryTableInit.obj \
+		  $(ARCH)\$(CONFIG)\GC.obj \
+		  $(ARCH)\$(CONFIG)\Identity.obj \
+		  $(ARCH)\$(CONFIG)\ImplicitContextI.obj \
+		  $(ARCH)\$(CONFIG)\ImplicitContext.obj \
+		  $(ARCH)\$(CONFIG)\IncomingAsync.obj \
+		  $(ARCH)\$(CONFIG)\Incoming.obj \
+		  $(ARCH)\$(CONFIG)\Initialize.obj \
+		  $(ARCH)\$(CONFIG)\Instance.obj \
+		  $(ARCH)\$(CONFIG)\LocalException.obj \
+		  $(ARCH)\$(CONFIG)\LocalObject.obj \
+		  $(ARCH)\$(CONFIG)\LocatorInfo.obj \
+		  $(ARCH)\$(CONFIG)\Locator.obj \
+		  $(ARCH)\$(CONFIG)\LoggerI.obj \
+		  $(ARCH)\$(CONFIG)\Logger.obj \
+		  $(ARCH)\$(CONFIG)\LoggerUtil.obj \
+		  $(ARCH)\$(CONFIG)\Network.obj \
+		  $(ARCH)\$(CONFIG)\ObjectAdapterFactory.obj \
+		  $(ARCH)\$(CONFIG)\ObjectAdapterI.obj \
+		  $(ARCH)\$(CONFIG)\ObjectAdapter.obj \
+		  $(ARCH)\$(CONFIG)\ObjectFactoryManager.obj \
+		  $(ARCH)\$(CONFIG)\ObjectFactory.obj \
+		  $(ARCH)\$(CONFIG)\Object.obj \
+		  $(ARCH)\$(CONFIG)\OpaqueEndpointI.obj \
+		  $(ARCH)\$(CONFIG)\OutgoingAsync.obj \
+		  $(ARCH)\$(CONFIG)\Outgoing.obj \
+		  $(ARCH)\$(CONFIG)\PluginManagerI.obj \
+		  $(ARCH)\$(CONFIG)\Plugin.obj \
+		  $(ARCH)\$(CONFIG)\Process.obj \
+		  $(ARCH)\$(CONFIG)\PropertiesI.obj \
+		  $(ARCH)\$(CONFIG)\Properties.obj \
+		  $(ARCH)\$(CONFIG)\PropertyNames.obj \
+		  $(ARCH)\$(CONFIG)\Protocol.obj \
+		  $(ARCH)\$(CONFIG)\ProtocolPluginFacade.obj \
+		  $(ARCH)\$(CONFIG)\ProxyFactory.obj \
+		  $(ARCH)\$(CONFIG)\Proxy.obj \
+		  $(ARCH)\$(CONFIG)\ReferenceFactory.obj \
+		  $(ARCH)\$(CONFIG)\Reference.obj \
+		  $(ARCH)\$(CONFIG)\RetryQueue.obj \
+		  $(ARCH)\$(CONFIG)\RequestHandler.obj \
+		  $(ARCH)\$(CONFIG)\RouterInfo.obj \
+		  $(ARCH)\$(CONFIG)\Router.obj \
+		  $(ARCH)\$(CONFIG)\Selector.obj \
+		  $(ARCH)\$(CONFIG)\ServantLocator.obj \
+		  $(ARCH)\$(CONFIG)\ServantManager.obj \
+		  $(ARCH)\$(CONFIG)\SliceChecksumDict.obj \
+		  $(ARCH)\$(CONFIG)\SliceChecksums.obj \
+		  $(ARCH)\$(CONFIG)\Stats.obj \
+		  $(ARCH)\$(CONFIG)\StreamI.obj \
+		  $(ARCH)\$(CONFIG)\Stream.obj \
+                  $(ARCH)\$(CONFIG)\StringConverter.obj \
+	          $(ARCH)\$(CONFIG)\ThreadPool.obj \
+		  $(ARCH)\$(CONFIG)\TraceLevels.obj \
+		  $(ARCH)\$(CONFIG)\TraceUtil.obj \
+		  $(ARCH)\$(CONFIG)\Transceiver.obj \
+		  $(ARCH)\$(CONFIG)\UdpConnector.obj \
+		  $(ARCH)\$(CONFIG)\UdpEndpointI.obj \
+		  $(ARCH)\$(CONFIG)\UdpTransceiver.obj
+
+LOCAL_OBJS	= $(ARCH)\$(CONFIG)\StreamAcceptor.obj \
+		  $(ARCH)\$(CONFIG)\StreamConnector.obj \
+		  $(ARCH)\$(CONFIG)\StreamEndpointI.obj \
+		  $(ARCH)\$(CONFIG)\StreamTransceiver.obj \
+		  $(ARCH)\$(CONFIG)\EndpointInfo.obj \
+		  $(ARCH)\$(CONFIG)\ConnectionInfo.obj
+
+SLICE_CORE_SRCS	= $(slicedir)\Ice\BuiltinSequences.ice \
+		  $(slicedir)\Ice\CommunicatorF.ice \
+		  $(slicedir)\Ice\Communicator.ice \
+		  $(slicedir)\Ice\ConnectionF.ice \
+		  $(slicedir)\Ice\Connection.ice \
+		  $(slicedir)\Ice\Current.ice \
+		  $(slicedir)\Ice\Endpoint.ice \
+		  $(slicedir)\Ice\EndpointF.ice \
+		  $(slicedir)\Ice\EndpointTypes.ice \
+		  $(slicedir)\Ice\FacetMap.ice \
+		  $(slicedir)\Ice\Identity.ice \
+		  $(slicedir)\Ice\ImplicitContextF.ice \
+		  $(slicedir)\Ice\ImplicitContext.ice \
+		  $(slicedir)\Ice\LocalException.ice \
+		  $(slicedir)\Ice\LocatorF.ice \
+		  $(slicedir)\Ice\Locator.ice \
+		  $(slicedir)\Ice\LoggerF.ice \
+		  $(slicedir)\Ice\Logger.ice \
+		  $(slicedir)\Ice\ObjectAdapterF.ice \
+		  $(slicedir)\Ice\ObjectAdapter.ice \
+		  $(slicedir)\Ice\ObjectFactoryF.ice \
+		  $(slicedir)\Ice\ObjectFactory.ice \
+		  $(slicedir)\Ice\PluginF.ice \
+		  $(slicedir)\Ice\Plugin.ice \
+		  $(slicedir)\Ice\ProcessF.ice \
+		  $(slicedir)\Ice\Process.ice \
+		  $(slicedir)\Ice\PropertiesF.ice \
+		  $(slicedir)\Ice\Properties.ice \
+		  $(slicedir)\Ice\RouterF.ice \
+		  $(slicedir)\Ice\Router.ice \
+		  $(slicedir)\Ice\ServantLocatorF.ice \
+		  $(slicedir)\Ice\ServantLocator.ice \
+		  $(slicedir)\Ice\SliceChecksumDict.ice \
+		  $(slicedir)\Ice\StatsF.ice \
+		  $(slicedir)\Ice\Stats.ice
+
+SLICE_SSL_SRCS	= $(slicedir)\IceSSL\EndpointInfo.ice \
+		  $(slicedir)\IceSSL\ConnectionInfo.ice
+
+SRCS		= $(OBJS:.obj=.cpp)
+SRCS		= $(SRCS:x86\=)
+SRCS		= $(SRCS:x64\=)
+SRCS		= $(SRCS:Retail\=..\)
+SRCS		= $(SRCS:Debug\=..\)
+
+LOCAL_SRCS	= $(LOCAL_OBJS:.obj=.cpp)
+LOCAL_SRCS	= $(LOCAL_SRCS:x86\=)
+LOCAL_SRCS	= $(LOCAL_SRCS:x64\=)
+LOCAL_SRCS	= $(LOCAL_SRCS:Retail\=.\)
+LOCAL_SRCS	= $(LOCAL_SRCS:Debug\=.\)
+
+SRCS		= $(SRCS) \
+		  $(LOCAL_SRCS) \
+		  ..\CommunicatorF.cpp \
+		  ..\ConnectionF.cpp \
+		  ..\EndpointF.cpp \
+		  ..\ImplicitContextF.cpp \
+		  ..\LocatorF.cpp \
+		  ..\LoggerF.cpp \
+		  ..\ObjectAdapterF.cpp \
+		  ..\ObjectFactoryF.cpp \
+		  ..\PluginF.cpp \
+		  ..\ProcessF.cpp \
+		  ..\PropertiesF.cpp \
+		  ..\RouterF.cpp \
+		  ..\ServantLocatorF.cpp \
+		  ..\StatsF.cpp
+
+HDIR		= $(headerdir)\Ice
+SDIR		= $(slicedir)\Ice
+
+CPPFLAGS	= -I..\.. $(CPPFLAGS) -DICE_API_EXPORTS -DWIN32_LEAN_AND_MEAN
+CORE_SLICE2CPPFLAGS	= --ice --include-dir Ice --dll-export ICE_API $(SLICE2CPPFLAGS)
+SSL_SLICE2CPPFLAGS 	= --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+RES_FILE 	= $(SOURCE_DIR)\Ice.res
+
+$(LIBNAME): $(LOCAL_OBJS) $(OBJS) $(RES_FILE) sdks
+	$(AR) $(ARFLAGS) $(OBJS) $(LOCAL_OBJS) /out:$(LIBNAME)
+
+$(HDIR)\BuiltinSequences.h ..\BuiltinSequences.cpp: $(slicedir)\Ice\BuiltinSequences.ice $(SLICE2CPP)
+	del /q $(HDIR)\BuiltinSequences.h ..\BuiltinSequences.cpp
+	$(SLICE2CPP) $(CORE_SLICE2CPPFLAGS) --stream $(slicedir)\Ice\BuiltinSequences.ice
+	move BuiltinSequences.cpp ..
+	move BuiltinSequences.h $(HDIR)
+
+Service.obj: $(SOURCE_DIR)\EventLoggerMsg.h
+
+Ice.res: $(SOURCE_DIR)\EventLoggerMsg.rc
+
+.cpp{$(ARCH)\$(CONFIG)\}.obj::
+	@if not exist "$(ARCH)\$(CONFIG)" mkdir $(ARCH)\$(CONFIG)
+	$(CXX) /c /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ $(CPPFLAGS) $(CXXFLAGS) $<
+
+{$(slicedir)\Ice}.ice.cpp:
+	@echo c
+	del /q $(headerdir)\Ice\$(*F).h $(*F).cpp
+	"$(SLICE2CPP)" $(CORE_SLICE2CPPFLAGS) $<
+	move $(*F).h $(headerdir)\Ice
+	move $(*F).cpp ..
+
+{$(slicedir)\IceSSL}.ice.cpp:
+	@echo d
+	del /q $(headerdir)\IceSSL\$(*F).h $(*F).cpp
+	"$(SLICE2CPP)" $(SSL_SLICE2CPPFLAGS) $<
+	move $(*F).h $(headerdir)\IceSSL
+
+depend::
+	del /q .depend.mak
+
+.cpp.depend:
+	$(CXX) /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ /Zs /showIncludes $(CXXFLAGS) $(CPPFLAGS) $< 2>&1 | python.exe $(ice_dir)/config/makedepend-winrt.py $<
+
+depend:: $(ARCH)\$(CONFIG) $(SLICE_CORE_SRCS) $(SLICE_SSL_SRCS) $(SRCS) $(SRCS_DEPEND)
+	$(SLICE2CPP) --depend $(CORE_SLICE2CPPFLAGS) $(SLICE_CORE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py "$$(headerdir)\Ice"
+	$(SLICE2CPP) --depend $(SSL_SLICE2CPPFLAGS) $(SLICE_SSL_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py "$$(headerdir)\IceSSL" "." 
+
+# These files are not automatically generated because VC2008 Express doesn't have mc.exe
+#EventLoggerMsg.h EventLoggerMsg.rc: EventLoggerMsg.mc
+#	mc EventLoggerMsg.mc
+
+clean::
+	-del /q $(SOURCE_DIR)\BuiltinSequences.cpp $(HDIR)\BuiltinSequences.h
+	-del /q $(SOURCE_DIR)\CommunicatorF.cpp $(HDIR)\CommunicatorF.h
+	-del /q $(SOURCE_DIR)\Communicator.cpp $(HDIR)\Communicator.h
+	-del /q $(SOURCE_DIR)\ConnectionF.cpp $(HDIR)\ConnectionF.h
+	-del /q $(SOURCE_DIR)\Connection.cpp $(HDIR)\Connection.h
+	-del /q $(SOURCE_DIR)\Current.cpp $(HDIR)\Current.h
+	-del /q $(SOURCE_DIR)\Endpoint.cpp $(HDIR)\Endpoint.h
+	-del /q $(SOURCE_DIR)\EndpointF.cpp $(HDIR)\EndpointF.h
+	-del /q $(SOURCE_DIR)\EndpointTypes.cpp $(HDIR)\EndpointTypes.h
+	-del /q $(SOURCE_DIR)\FacetMap.cpp $(HDIR)\FacetMap.h
+	-del /q $(SOURCE_DIR)\ImplicitContextF.cpp $(HDIR)\ImplicitContextF.h	
+	-del /q $(SOURCE_DIR)\ImplicitContext.cpp $(HDIR)\ImplicitContext.h	
+	-del /q $(SOURCE_DIR)\Identity.cpp $(HDIR)\Identity.h
+	-del /q $(SOURCE_DIR)\LocalException.cpp $(HDIR)\LocalException.h
+	-del /q $(SOURCE_DIR)\LocatorF.cpp $(HDIR)\LocatorF.h
+	-del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h
+	-del /q $(SOURCE_DIR)\LoggerF.cpp $(HDIR)\LoggerF.h
+	-del /q $(SOURCE_DIR)\Logger.cpp $(HDIR)\Logger.h
+	-del /q $(SOURCE_DIR)\ObjectAdapterF.cpp $(HDIR)\ObjectAdapterF.h
+	-del /q $(SOURCE_DIR)\ObjectAdapter.cpp $(HDIR)\ObjectAdapter.h
+	-del /q $(SOURCE_DIR)\ObjectFactoryF.cpp $(HDIR)\ObjectFactoryF.h
+	-del /q $(SOURCE_DIR)\ObjectFactory.cpp $(HDIR)\ObjectFactory.h
+	-del /q $(SOURCE_DIR)\PluginF.cpp $(HDIR)\PluginF.h
+	-del /q $(SOURCE_DIR)\Plugin.cpp $(HDIR)\Plugin.h
+	-del /q $(SOURCE_DIR)\ProcessF.cpp $(HDIR)\ProcessF.h
+	-del /q $(SOURCE_DIR)\Process.cpp $(HDIR)\Process.h
+	-del /q $(SOURCE_DIR)\PropertiesF.cpp $(HDIR)\PropertiesF.h
+	-del /q $(SOURCE_DIR)\Properties.cpp $(HDIR)\Properties.h
+	-del /q $(SOURCE_DIR)\RouterF.cpp $(HDIR)\RouterF.h
+	-del /q $(SOURCE_DIR)\Router.cpp $(HDIR)\Router.h
+	-del /q $(SOURCE_DIR)\ServantLocatorF.cpp $(HDIR)\ServantLocatorF.h
+	-del /q $(SOURCE_DIR)\ServantLocator.cpp $(HDIR)\ServantLocator.h
+	-del /q $(SOURCE_DIR)\SliceChecksumDict.cpp $(HDIR)\SliceChecksumDict.h
+	-del /q $(SOURCE_DIR)\StatsF.cpp $(HDIR)\StatsF.h
+	-del /q $(SOURCE_DIR)\Stats.cpp $(HDIR)\Stats.h
+	-del /q EndpointInfo.cpp $(headerdir)\IceSSL\EndpointInfo.h
+	-del /q ConnectionInfo.cpp $(headerdir)\IceSSL\ConnectionInfo.h
+	-del /q $(RES_FILE)
+
+!include .depend.mak
diff --git a/cpp/src/Ice/winrt/StreamAcceptor.cpp b/cpp/src/Ice/winrt/StreamAcceptor.cpp
new file mode 100644
index 00000000000..dd113e904c9
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamAcceptor.cpp
@@ -0,0 +1,217 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/winrt/StreamAcceptor.h>
+#include <Ice/winrt/StreamTransceiver.h>
+
+#include <Ice/Instance.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/Exception.h>
+#include <Ice/Properties.h>
+#include <IceUtil/StringUtil.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+
+NativeInfoPtr
+IceInternal::StreamAcceptor::getNativeInfo()
+{
+    return this;
+}
+
+void
+IceInternal::StreamAcceptor::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+{
+    _completedHandler = handler;
+}
+
+void
+IceInternal::StreamAcceptor::close()
+{
+    if(_traceLevels->network >= 1)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "stopping to accept " << typeToString(_type) << " connections at " << toString();
+    }
+
+
+    IceUtil::Mutex::Lock lock(_mutex);
+    if(_acceptPending)
+    {
+        assert(_accepted.empty());
+        _completedHandler(SocketOperationRead);
+        _acceptPending = false;
+    } 
+    else if(!_accepted.empty())
+    {
+        for(deque<StreamSocket^>::const_iterator p = _accepted.begin(); p != _accepted.end(); ++p)
+        {
+            closeSocket(*p);
+        }
+        _accepted.clear();
+    }
+
+    SOCKET fd = _fd;
+    _fd = INVALID_SOCKET;
+    closeSocket(fd);
+}
+
+void
+IceInternal::StreamAcceptor::listen()
+{
+    if(_traceLevels->network >= 1)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "accepting " << typeToString(_type) << " connections at " << toString();
+
+        vector<string> interfaces = 
+            getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true);
+        if(!interfaces.empty())
+        {
+            out << "\nlocal interfaces: ";
+            out << IceUtilInternal::joinString(interfaces, ", ");
+        }
+    }
+}
+
+void
+IceInternal::StreamAcceptor::startAccept()
+{
+    assert(_fd != INVALID_SOCKET);
+
+    //
+    // If there are already sockets waiting to be accepted, we just
+    // notify the selector that the acceptor is ready for acceting the
+    // new socket. Otherwise, we set the _acceptPending flag, when a
+    // new socket connection event is received, the message handler
+    // will notify the selector.
+    //
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_acceptPending);
+    if(!_accepted.empty())
+    {
+        _completedHandler(SocketOperationRead);
+    }
+    else
+    {
+        _acceptPending = true;
+    }
+}
+
+void
+IceInternal::StreamAcceptor::finishAccept()
+{
+    //
+    // Nothing to do, we just check there's at least one accepted
+    // socket or the acceptor was closed.
+    //
+    IceUtil::Mutex::Lock lock(_mutex);
+    assert(!_acceptPending && (!_accepted.empty() || _fd == INVALID_SOCKET));
+}
+
+TransceiverPtr
+IceInternal::StreamAcceptor::accept()
+{
+    if(_fd == INVALID_SOCKET) // Acceptor closed.
+    {
+        assert(_accepted.empty());
+        throw SocketException(__FILE__, __LINE__);
+    }
+    
+    StreamSocket^ fd;
+    {
+        IceUtil::Mutex::Lock lock(_mutex);
+        assert(!_accepted.empty());
+        fd = _accepted.front();
+        _accepted.pop_front();
+    }
+
+    if(_traceLevels->network >= 1)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "accepted " << typeToString(_type) << " connection\n" << fdToString(fd);
+    }
+    return new StreamTransceiver(_instance, _type, fd, true);
+}
+
+string
+IceInternal::StreamAcceptor::toString() const
+{
+    return addrToString(_addr);
+}
+
+int
+IceInternal::StreamAcceptor::effectivePort() const
+{
+    return getPort(_addr);
+}
+
+IceInternal::StreamAcceptor::StreamAcceptor(const InstancePtr& instance, Ice::Short type, const string& host, int port, 
+                                            ProtocolSupport protocol) :
+    _instance(instance),
+    _type(type),
+    _traceLevels(instance->traceLevels()),
+    _logger(instance->initializationData().logger),
+    _addr(getAddressForServer(host, port, protocol)),
+    _acceptPending(false)
+{
+    _fd = ref new StreamSocketListener();
+
+    safe_cast<StreamSocketListener^>(_fd)->ConnectionReceived += 
+        ref new TypedEventHandler<StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^>(
+            [=](StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^ args)
+                {
+                    queueAcceptedSocket(args->Socket);
+                });
+    
+    if(_traceLevels->network >= 2)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "attempting to bind to " << typeToString(_type) << " socket " << toString();
+    }
+    const_cast<Address&>(_addr) = doBind(_fd, _addr);
+}
+
+IceInternal::StreamAcceptor::~StreamAcceptor()
+{
+    assert(_fd == INVALID_SOCKET);
+}
+
+void
+IceInternal::StreamAcceptor::queueAcceptedSocket(StreamSocket^ socket)
+{
+    IceUtil::Mutex::Lock lock(_mutex);
+    if(_fd == INVALID_SOCKET) // Acceptor was closed.
+    {
+        closeSocket(socket);
+        return;
+    }
+    _accepted.push_back(socket);
+
+    //
+    // If the acceptor is waiting for a socket to be accepted, notify
+    // the selector that the acceptor is ready for "read". This will
+    // in turn caused finishAccept() and accept() to be called by the
+    // thread pool. If the acceptor isn't ready to accept the socket,
+    // it is just queued, when startAccept is called it will be dequed.
+    //  
+    if(_acceptPending)
+    {
+        _completedHandler(SocketOperationRead);
+        _acceptPending = false;
+    }
+}
diff --git a/cpp/src/Ice/winrt/StreamAcceptor.h b/cpp/src/Ice/winrt/StreamAcceptor.h
new file mode 100644
index 00000000000..d5f84422442
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamAcceptor.h
@@ -0,0 +1,69 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_ACCEPTOR_H
+#define ICE_STREAM_ACCEPTOR_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/InstanceF.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
+#include <Ice/Acceptor.h>
+#include <Ice/Network.h>
+
+#include <IceUtil/Mutex.h>
+
+#include <deque>
+
+namespace IceInternal
+{
+
+class StreamEndpoint;
+
+class StreamAcceptor : public Acceptor, public NativeInfo
+{
+public:
+
+    virtual NativeInfoPtr getNativeInfo();
+    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
+
+    virtual void close();
+    virtual void listen();
+
+    virtual void startAccept();
+    virtual void finishAccept();
+
+    virtual TransceiverPtr accept();
+    virtual std::string toString() const;
+
+    int effectivePort() const;
+
+private:
+
+    StreamAcceptor(const InstancePtr&, Ice::Short, const std::string&, int, ProtocolSupport);
+    virtual ~StreamAcceptor();
+    friend class StreamEndpointI;
+
+    virtual void queueAcceptedSocket(Windows::Networking::Sockets::StreamSocket^);
+
+    const InstancePtr _instance;
+    const Ice::Short _type;
+    const TraceLevelsPtr _traceLevels;
+    const ::Ice::LoggerPtr _logger;
+    const Address _addr;
+
+    IceUtil::Mutex _mutex;
+    bool _acceptPending;
+    SocketOperationCompletedHandler^ _completedHandler;
+    std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted;
+};
+
+}
+#endif
+
diff --git a/cpp/src/Ice/winrt/StreamConnector.cpp b/cpp/src/Ice/winrt/StreamConnector.cpp
new file mode 100644
index 00000000000..88e26aae77b
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamConnector.cpp
@@ -0,0 +1,152 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/winrt/StreamConnector.h>
+#include <Ice/winrt/StreamTransceiver.h>
+#include <Ice/winrt/StreamEndpointI.h>
+
+#include <Ice/Instance.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/Network.h>
+#include <Ice/Exception.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+TransceiverPtr
+IceInternal::StreamConnector::connect()
+{
+    if(_traceLevels->network >= 2)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "trying to establish " << typeToString(_type) << " connection to " << toString();
+    }
+
+    try
+    {
+        TransceiverPtr transceiver = new StreamTransceiver(_instance, _type, createSocket(false, _addr), false);
+        dynamic_cast<StreamTransceiver*>(transceiver.get())->connect(_addr);
+        return transceiver;
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        if(_traceLevels->network >= 2)
+        {
+            Trace out(_logger, _traceLevels->networkCat);
+            out << "failed to establish " << typeToString(_type) << " connection to " << toString() << "\n" << ex;
+        }
+        throw;
+    }
+}
+
+Short
+IceInternal::StreamConnector::type() const
+{
+    return _type;
+}
+
+string
+IceInternal::StreamConnector::toString() const
+{
+    return addrToString(_addr);
+}
+
+bool
+IceInternal::StreamConnector::operator==(const Connector& r) const
+{
+    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(_type != p->_type)
+    {
+        return false;
+    }
+
+    if(compareAddress(_addr, p->_addr) != 0)
+    {
+        return false;
+    }
+    
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+IceInternal::StreamConnector::operator!=(const Connector& r) const
+{
+    return !operator==(r);
+}
+
+bool
+IceInternal::StreamConnector::operator<(const Connector& r) const
+{
+    const StreamConnector* p = dynamic_cast<const StreamConnector*>(&r);
+    if(!p)
+    {
+        return type() < r.type();
+    }
+
+    if(_type < p->_type)
+    {
+        return true;
+    }
+    else if(p->_type < _type)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+    return compareAddress(_addr, p->_addr) < 0;
+}
+
+IceInternal::StreamConnector::StreamConnector(const InstancePtr& instance, Ice::Short type, const Address& addr, 
+                                              Ice::Int timeout, const string& connectionId) :
+    _instance(instance),
+    _type(type),
+    _traceLevels(instance->traceLevels()),
+    _logger(instance->initializationData().logger),
+    _addr(addr),
+    _timeout(timeout),
+    _connectionId(connectionId)
+{
+}
+
+IceInternal::StreamConnector::~StreamConnector()
+{
+}
diff --git a/cpp/src/Ice/winrt/StreamConnector.h b/cpp/src/Ice/winrt/StreamConnector.h
new file mode 100644
index 00000000000..88f8721083a
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamConnector.h
@@ -0,0 +1,53 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_TCP_CONNECTOR_H
+#define ICE_TCP_CONNECTOR_H
+
+#include <Ice/TransceiverF.h>
+#include <Ice/InstanceF.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
+#include <Ice/Connector.h>
+#include <Ice/Network.h>
+
+namespace IceInternal
+{
+
+class StreamConnector : public Connector
+{
+public:
+    
+    virtual TransceiverPtr connect();
+
+    virtual Ice::Short type() const;
+    virtual std::string toString() const;
+
+    virtual bool operator==(const Connector&) const;
+    virtual bool operator!=(const Connector&) const;
+    virtual bool operator<(const Connector&) const;
+
+private:
+
+    StreamConnector(const InstancePtr&, Ice::Short, const Address&, Ice::Int, const std::string&); 
+    virtual ~StreamConnector();
+    friend class StreamEndpointI;
+
+    const InstancePtr _instance;
+    const Ice::Short _type;
+    const TraceLevelsPtr _traceLevels;
+    const ::Ice::LoggerPtr _logger;
+    const Address _addr;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp
new file mode 100644
index 00000000000..c32a2308974
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp
@@ -0,0 +1,623 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/winrt/StreamEndpointI.h>
+#include <Ice/winrt/StreamAcceptor.h>
+#include <Ice/winrt/StreamConnector.h>
+#include <Ice/winrt/StreamTransceiver.h>
+
+#include <Ice/Network.h>
+#include <Ice/BasicStream.h>
+#include <Ice/LocalException.h>
+#include <Ice/Instance.h>
+#include <Ice/DefaultsAndOverrides.h>
+#include <Ice/HashUtil.h>
+
+#include <IceSSL/EndpointInfo.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+namespace
+{
+
+template<class T> class InfoI : public T
+{
+public:
+    
+    InfoI(Ice::Short type, Ice::Int to, bool comp, const string& host, Ice::Int port) :
+        T(to, comp, host, port), _type(type)
+    {
+    }
+    
+    virtual Ice::Short
+    type() const
+    {
+        return _type;
+    }
+    
+    virtual bool
+    datagram() const
+    {
+        return false;
+    }
+    
+    virtual bool
+    secure() const
+    {
+        return _type == IceSSL::EndpointType;
+    }
+
+private:
+    
+    Ice::Short _type;
+};
+
+}
+
+IceInternal::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, Ice::Short type, const string& ho, Int po, 
+                                              Int ti, const string& conId, bool co) :
+    _instance(instance),
+    _type(type),
+    _host(ho),
+    _port(po),
+    _timeout(ti),
+    _connectionId(conId),
+    _compress(co)
+{
+}
+
+IceInternal::StreamEndpointI::StreamEndpointI(const InstancePtr& instance, Ice::Short type, const string& str, 
+                                              bool oaEndpoint) :
+    _instance(instance),
+    _type(type),
+    _port(0),
+    _timeout(-1),
+    _compress(false)
+{
+    const string delim = " \t\n\r";
+
+    string::size_type beg;
+    string::size_type end = 0;
+
+    while(true)
+    {
+        beg = str.find_first_not_of(delim, end);
+        if(beg == string::npos)
+        {
+            break;
+        }
+        
+        end = str.find_first_of(delim, beg);
+        if(end == string::npos)
+        {
+            end = str.length();
+        }
+
+        string option = str.substr(beg, end - beg);
+        if(option.length() != 2 || option[0] != '-')
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "expected an endpoint option but found `" + option + "' in endpoint `" + typeToString(_type) +
+                " " + str + "'";
+            throw ex;
+        }
+
+        string argument;
+        string::size_type argumentBeg = str.find_first_not_of(delim, end);
+        if(argumentBeg != string::npos && str[argumentBeg] != '-')
+        {
+            beg = argumentBeg;
+            end = str.find_first_of(delim, beg);
+            if(end == string::npos)
+            {
+                end = str.length();
+            }
+            argument = str.substr(beg, end - beg);
+            if(argument[0] == '\"' && argument[argument.size() - 1] == '\"')
+            {
+                argument = argument.substr(1, argument.size() - 2);
+            }
+        }
+
+        switch(option[1])
+        {
+            case 'h':
+            {
+                if(argument.empty())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "no argument provided for -h option in endpoint `" + typeToString(_type) + " " +
+                        str + "'";
+                    throw ex;
+                }
+                const_cast<string&>(_host) = argument;
+                break;
+            }
+
+            case 'p':
+            {
+                if(argument.empty())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "no argument provided for -p option in endpoint `" + typeToString(_type) + " " + str + "'";
+                    throw ex;
+                }
+                istringstream p(argument);
+                if(!(p >> const_cast<Int&>(_port)) || !p.eof())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "invalid port value `" + argument + "' in endpoint `" + typeToString(_type) + " " + 
+                        str + "'";
+                    throw ex;
+                }
+                else if(_port < 0 || _port > 65535)
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "port value `" + argument + "' out of range in endpoint `" + typeToString(_type) + " " + 
+                        str + "'";
+                    throw ex;
+                }
+                break;
+            }
+
+            case 't':
+            {
+                if(argument.empty())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "no argument provided for -t option in endpoint `" + typeToString(_type) + " " + str + "'";
+                    throw ex;
+                }
+                istringstream t(argument);
+                if(!(t >> const_cast<Int&>(_timeout)) || !t.eof())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "invalid timeout value `" + argument + "' in endpoint `" + typeToString(_type) + " " +
+                        str + "'";
+                    throw ex;
+                }
+                break;
+            }
+
+            case 'z':
+            {
+                if(!argument.empty())
+                {
+                    EndpointParseException ex(__FILE__, __LINE__);
+                    ex.str = "unexpected argument `" + argument + "' provided for -z option in `" + 
+                        typeToString(_type) + " " + str + "'";
+                    throw ex;
+                }
+                const_cast<bool&>(_compress) = true;
+                break;
+            }
+
+            default:
+            {
+                EndpointParseException ex(__FILE__, __LINE__);
+                ex.str = "unknown option `" + option + "' in `" + typeToString(_type) + " " + str + "'";
+                throw ex;
+            }
+        }
+    }
+
+    if(_host.empty())
+    {
+        const_cast<string&>(_host) = _instance->defaultsAndOverrides()->defaultHost;
+    }
+    else if(_host == "*")
+    {
+        if(oaEndpoint)
+        {
+            const_cast<string&>(_host) = string();
+        }
+        else
+        {
+            EndpointParseException ex(__FILE__, __LINE__);
+            ex.str = "`-h *' not valid for proxy endpoint `" + typeToString(_type) + " " + str + "'";
+            throw ex;
+        }
+    }
+}
+
+IceInternal::StreamEndpointI::StreamEndpointI(BasicStream* s, Ice::Short type) :
+    _instance(s->instance()),
+    _type(type),
+    _port(0),
+    _timeout(-1),
+    _compress(false)
+{
+    s->startReadEncaps();
+    s->read(const_cast<string&>(_host), false);
+    s->read(const_cast<Int&>(_port));
+    s->read(const_cast<Int&>(_timeout));
+    s->read(const_cast<bool&>(_compress));
+    s->endReadEncaps();
+}
+
+void
+IceInternal::StreamEndpointI::streamWrite(BasicStream* s) const
+{
+    s->write(_type);
+    s->startWriteEncaps();
+    s->write(_host, false);
+    s->write(_port);
+    s->write(_timeout);
+    s->write(_compress);
+    s->endWriteEncaps();
+}
+
+string
+IceInternal::StreamEndpointI::toString() const
+{
+    //
+    // WARNING: Certain features, such as proxy validation in Glacier2,
+    // depend on the format of proxy strings. Changes to toString() and
+    // methods called to generate parts of the reference string could break
+    // these features. Please review for all features that depend on the
+    // format of proxyToString() before changing this and related code.
+    //
+    ostringstream s;
+    s << "" + typeToString(_type) + "";
+
+    if(!_host.empty())
+    {
+        s << " -h ";
+        bool addQuote = _host.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _host;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+    }
+
+    s << " -p " << _port;
+    if(_timeout != -1)
+    {
+        s << " -t " << _timeout;
+    }
+    if(_compress)
+    {
+        s << " -z";
+    }
+    return s.str();
+}
+
+EndpointInfoPtr
+IceInternal::StreamEndpointI::getInfo() const
+{
+    switch(_type)
+    {
+    case TCPEndpointType:
+        return new InfoI<Ice::TCPEndpointInfo>(_type, _timeout, _compress, _host, _port);
+    case IceSSL::EndpointType:
+        return new InfoI<IceSSL::EndpointInfo>(_type, _timeout, _compress, _host, _port);
+    default:
+        assert(false);
+        return 0;
+    }
+}
+
+Short
+IceInternal::StreamEndpointI::type() const
+{
+    return _type;
+}
+
+Int
+IceInternal::StreamEndpointI::timeout() const
+{
+    return _timeout;
+}
+
+EndpointIPtr
+IceInternal::StreamEndpointI::timeout(Int timeout) const
+{
+    if(timeout == _timeout)
+    {
+        return const_cast<StreamEndpointI*>(this);
+    }
+    else
+    {
+        return new StreamEndpointI(_instance, _type, _host, _port, timeout, _connectionId, _compress);
+    }
+}
+
+EndpointIPtr
+IceInternal::StreamEndpointI::connectionId(const string& connectionId) const
+{
+    if(connectionId == _connectionId)
+    {
+        return const_cast<StreamEndpointI*>(this);
+    }
+    else
+    {
+        return new StreamEndpointI(_instance, _type, _host, _port, _timeout, connectionId, _compress);
+    }
+}
+
+bool
+IceInternal::StreamEndpointI::compress() const
+{
+    return _compress;
+}
+
+EndpointIPtr
+IceInternal::StreamEndpointI::compress(bool compress) const
+{
+    if(compress == _compress)
+    {
+        return const_cast<StreamEndpointI*>(this);
+    }
+    else
+    {
+        return new StreamEndpointI(_instance, _type, _host, _port, _timeout, _connectionId, compress);
+    }
+}
+
+bool
+IceInternal::StreamEndpointI::datagram() const
+{
+    return false;
+}
+
+bool
+IceInternal::StreamEndpointI::secure() const
+{
+    return _type == IceSSL::EndpointType;
+}
+
+TransceiverPtr
+IceInternal::StreamEndpointI::transceiver(EndpointIPtr& endp) const
+{
+    endp = const_cast<StreamEndpointI*>(this);
+    return 0;
+}
+
+vector<ConnectorPtr>
+IceInternal::StreamEndpointI::connectors() const
+{
+    return connectors(getAddresses(_host, _port, _instance->protocolSupport(), true));
+}
+
+void
+IceInternal::StreamEndpointI::connectors_async(const EndpointI_connectorsPtr& callback) const
+{
+    callback->connectors(connectors());
+}
+
+AcceptorPtr
+IceInternal::StreamEndpointI::acceptor(EndpointIPtr& endp, const string&) const
+{
+    StreamAcceptor* p = new StreamAcceptor(_instance, _type, _host, _port, _instance->protocolSupport());
+    endp = new StreamEndpointI(_instance, _type, _host, p->effectivePort(), _timeout, _connectionId, _compress);
+    return p;
+}
+
+
+vector<EndpointIPtr>
+IceInternal::StreamEndpointI::expand() const
+{
+    vector<EndpointIPtr> endps;
+    vector<string> hosts = getHostsForEndpointExpand(_host, _instance->protocolSupport(), false);
+    if(hosts.empty())
+    {
+        endps.push_back(const_cast<StreamEndpointI*>(this));
+    }
+    else
+    {
+        for(vector<string>::const_iterator p = hosts.begin(); p != hosts.end(); ++p)
+        {
+            endps.push_back(new StreamEndpointI(_instance, _type, *p, _port, _timeout, _connectionId, _compress));
+        }
+    }
+    return endps;
+}
+
+bool
+IceInternal::StreamEndpointI::equivalent(const EndpointIPtr& endpoint) const
+{
+    const StreamEndpointI* streamEndpointI = dynamic_cast<const StreamEndpointI*>(endpoint.get());
+    if(!streamEndpointI)
+    {
+        return false;
+    }
+    return streamEndpointI->_host == _host && streamEndpointI->_port == _port;
+}
+
+bool
+IceInternal::StreamEndpointI::operator==(const LocalObject& r) const
+{
+    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    if(!p)
+    {
+        return false;
+    }
+
+    if(this == p)
+    {
+        return true;
+    }
+
+    if(_type != p->_type)
+    {
+        return false;
+    }
+
+    if(_host != p->_host)
+    {
+        return false;
+    }
+
+    if(_port != p->_port)
+    {
+        return false;
+    }
+
+    if(_timeout != p->_timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId != p->_connectionId)
+    {
+        return false;
+    }
+
+    if(_compress != p->_compress)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+bool
+IceInternal::StreamEndpointI::operator<(const LocalObject& r) const
+{
+    const StreamEndpointI* p = dynamic_cast<const StreamEndpointI*>(&r);
+    if(!p)
+    {
+        const EndpointI* e = dynamic_cast<const EndpointI*>(&r);
+        if(!e)
+        {
+            return false;
+        }
+        return type() < e->type();
+    }
+
+    if(this == p)
+    {
+        return false;
+    }
+
+    if(_type < p->_type)
+    {
+        return true;
+    }
+    else if(p->_type < _type)
+    {
+        return false;
+    }
+
+    if(_host < p->_host)
+    {
+        return true;
+    }
+    else if (p->_host < _host)
+    {
+        return false;
+    }
+
+    if(_port < p->_port)
+    {
+        return true;
+    }
+    else if(p->_port < _port)
+    {
+        return false;
+    }
+
+    if(_timeout < p->_timeout)
+    {
+        return true;
+    }
+    else if(p->_timeout < _timeout)
+    {
+        return false;
+    }
+
+    if(_connectionId < p->_connectionId)
+    {
+        return true;
+    }
+    else if(p->_connectionId < _connectionId)
+    {
+        return false;
+    }
+
+    if(!_compress && p->_compress)
+    {
+        return true;
+    }
+    else if(p->_compress < _compress)
+    {
+        return false;
+    }
+
+    return false;
+}
+
+Ice::Int
+IceInternal::StreamEndpointI::hashInit() const
+{
+    Ice::Int h = 0;
+    hashAdd(h, _host);
+    hashAdd(h, _port);
+    hashAdd(h, _timeout);
+    hashAdd(h, _connectionId);
+    hashAdd(h, _compress);
+    return h;
+}
+
+vector<ConnectorPtr>
+IceInternal::StreamEndpointI::connectors(const vector<Address>& addresses) const
+{
+    vector<ConnectorPtr> connectors;
+    for(unsigned int i = 0; i < addresses.size(); ++i)
+    {
+        connectors.push_back(new StreamConnector(_instance, _type, addresses[i], _timeout, _connectionId));
+    }
+    return connectors;
+}
+
+IceInternal::StreamEndpointFactory::StreamEndpointFactory(const InstancePtr& instance, Ice::Short type)
+    : _instance(instance), _type(type)
+{
+}
+
+IceInternal::StreamEndpointFactory::~StreamEndpointFactory()
+{
+}
+
+Short
+IceInternal::StreamEndpointFactory::type() const
+{
+    return _type;
+}
+
+string
+IceInternal::StreamEndpointFactory::protocol() const
+{
+    return typeToString(_type);
+}
+
+EndpointIPtr
+IceInternal::StreamEndpointFactory::create(const std::string& str, bool oaEndpoint) const
+{
+    return new StreamEndpointI(_instance, _type, str, oaEndpoint);
+}
+
+EndpointIPtr
+IceInternal::StreamEndpointFactory::read(BasicStream* s) const
+{
+    return new StreamEndpointI(s, _type);
+}
+
+void
+IceInternal::StreamEndpointFactory::destroy()
+{
+    _instance = 0;
+}
diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h
new file mode 100644
index 00000000000..6d102ff3647
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamEndpointI.h
@@ -0,0 +1,90 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_TCP_ENDPOINT_I_H
+#define ICE_TCP_ENDPOINT_I_H
+
+#include <IceUtil/Config.h>
+#include <Ice/EndpointI.h>
+#include <Ice/EndpointFactory.h>
+#include <Ice/Network.h> // for IceIternal::Address
+
+namespace IceInternal
+{
+
+class StreamEndpointI : public EndpointI
+{
+public:
+
+    StreamEndpointI(const InstancePtr&, Ice::Short, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
+    StreamEndpointI(const InstancePtr&, Ice::Short, const std::string&, bool);
+    StreamEndpointI(BasicStream*, Ice::Short);
+
+    virtual void streamWrite(BasicStream*) const;
+    virtual std::string toString() const;
+    virtual Ice::EndpointInfoPtr getInfo() const;
+    virtual Ice::Short type() const;
+    virtual Ice::Int timeout() const;
+    virtual EndpointIPtr timeout(Ice::Int) const;
+    virtual EndpointIPtr connectionId(const ::std::string&) const;
+    virtual bool compress() const;
+    virtual EndpointIPtr compress(bool) const;
+    virtual bool datagram() const;
+    virtual bool secure() const;
+    virtual TransceiverPtr transceiver(EndpointIPtr&) const;
+    virtual std::vector<ConnectorPtr> connectors() const;
+    virtual void connectors_async(const EndpointI_connectorsPtr&) const;
+    virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const;
+    virtual std::vector<EndpointIPtr> expand() const;
+    virtual bool equivalent(const EndpointIPtr&) const;
+
+    virtual bool operator==(const Ice::LocalObject&) const;
+    virtual bool operator<(const Ice::LocalObject&) const;
+
+private:
+
+    virtual ::Ice::Int hashInit() const;
+    virtual std::vector<ConnectorPtr> connectors(const std::vector<IceInternal::Address>&) const;
+
+    //
+    // All members are const, because endpoints are immutable.
+    //
+    const InstancePtr _instance;
+    const Ice::Short _type;
+    const std::string _host;
+    const Ice::Int _port;
+    const Ice::Int _timeout;
+    const std::string _connectionId;
+    const bool _compress;
+};
+
+class StreamEndpointFactory : public EndpointFactory
+{
+public:
+
+    virtual ~StreamEndpointFactory();
+
+    virtual Ice::Short type() const;
+    virtual std::string protocol() const;
+    virtual EndpointIPtr create(const std::string&, bool) const;
+    virtual EndpointIPtr read(BasicStream*) const;
+    virtual void destroy();
+
+private:
+
+    StreamEndpointFactory(const InstancePtr&, Ice::Short);
+    friend class Instance;
+
+    InstancePtr _instance;
+    const Ice::Short _type;
+};
+
+}
+
+#endif
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.cpp b/cpp/src/Ice/winrt/StreamTransceiver.cpp
new file mode 100644
index 00000000000..9d7e47f53fb
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamTransceiver.cpp
@@ -0,0 +1,444 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/winrt/StreamTransceiver.h>
+#include <Ice/Connection.h>
+#include <Ice/Instance.h>
+#include <Ice/TraceLevels.h>
+#include <Ice/LoggerUtil.h>
+#include <Ice/Stats.h>
+#include <Ice/Buffer.h>
+#include <Ice/LocalException.h>
+#include <Ice/Properties.h>
+
+#include <IceSSL/EndpointInfo.h>
+#include <IceSSL/ConnectionInfo.h>
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Storage::Streams;
+using namespace Windows::Networking;
+using namespace Windows::Networking::Sockets;
+
+namespace
+{
+
+AsyncOperationCompletedHandler<unsigned int>^
+createAsyncOperationCompletedHandler(SocketOperationCompletedHandler^ cb, SocketOperation op, AsyncInfo& info)
+{
+    return ref new AsyncOperationCompletedHandler<unsigned int>(
+        [=,&info] (IAsyncOperation<unsigned int>^ operation, Windows::Foundation::AsyncStatus status)
+        {
+            if(status != Windows::Foundation::AsyncStatus::Completed)
+            {
+                info.count = SOCKET_ERROR;
+                info.error = operation->ErrorCode.Value;
+            }
+            else
+            {
+                info.count = static_cast<int>(operation->GetResults());
+            }
+            cb(op);
+        });
+}
+
+}
+
+string
+IceInternal::typeToString(Ice::Short type)
+{
+    switch(type)
+    {
+    case TCPEndpointType:
+        return "tcp";
+    case IceSSL::EndpointType:
+        return "ssl";
+    default:
+        assert(false);
+        return "";
+    }
+}
+
+NativeInfoPtr
+IceInternal::StreamTransceiver::getNativeInfo()
+{
+    return this;
+}
+
+void 
+IceInternal::StreamTransceiver::setCompletedHandler(SocketOperationCompletedHandler^ handler)
+{
+    _completedHandler = handler;
+    _readOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, SocketOperationRead, _read);
+    _writeOperationCompletedHandler = createAsyncOperationCompletedHandler(handler, SocketOperationWrite, _write);
+}
+
+SocketOperation
+IceInternal::StreamTransceiver::initialize()
+{
+    if(_state == StateNeedConnect)
+    {
+        _state = StateConnectPending;
+        return SocketOperationConnect;
+    }
+    else if(_state <= StateConnectPending)
+    {
+        try
+        {
+            if(_write.count == SOCKET_ERROR)
+            {
+                checkConnectErrorCode(__FILE__, __LINE__, _write.error, _connectAddr.host);
+            }
+            _state = StateConnected;
+            _desc = fdToString(_fd);
+        }
+        catch(const Ice::LocalException& ex)
+        {
+            if(_traceLevels->network >= 2)
+            {
+                Trace out(_logger, _traceLevels->networkCat);
+                out << "failed to establish " << typeToString(_type) << " connection\n";
+                out << "local address: <not available>\n";
+                out << "remote address: " << addrToString(_connectAddr) << "\n" << ex;
+            }
+            throw;
+        }
+
+        if(_traceLevels->network >= 1)
+        {
+            Trace out(_logger, _traceLevels->networkCat);
+            out << "" << typeToString(_type) << " connection established\n" << _desc;
+        }
+    }
+    assert(_state == StateConnected);
+    return SocketOperationNone;
+}
+
+void
+IceInternal::StreamTransceiver::close()
+{
+    if(_state == StateConnected && _traceLevels->network >= 1)
+    {
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "closing " << typeToString(_type) << " connection\n" << toString();
+    }
+
+    assert(_fd != INVALID_SOCKET);
+    try
+    {
+        closeSocket(_fd);
+        _fd = INVALID_SOCKET;
+    }
+    catch(const SocketException&)
+    {
+        _fd = INVALID_SOCKET;
+        throw;
+    }
+}
+
+bool
+IceInternal::StreamTransceiver::write(Buffer& buf)
+{
+    return false;
+}
+
+bool
+IceInternal::StreamTransceiver::read(Buffer& buf)
+{
+    return false;
+}
+
+bool
+IceInternal::StreamTransceiver::startWrite(Buffer& buf)
+{
+    if(_state < StateConnected)
+    {
+        try
+        {
+            IAsyncAction^ action = safe_cast<StreamSocket^>(_fd)->ConnectAsync(
+                _connectAddr.host,
+                _connectAddr.port,
+                _type == IceSSL::EndpointType ? SocketProtectionLevel::Ssl : SocketProtectionLevel::PlainSocket);
+
+            if(!checkIfErrorOrCompleted(SocketOperationConnect, action))
+            {
+                action->Completed = ref new AsyncActionCompletedHandler(
+                    [=] (IAsyncAction^ info, Windows::Foundation::AsyncStatus status)
+                    {
+                        if(status != Windows::Foundation::AsyncStatus::Completed)
+                        {
+                            _write.count = SOCKET_ERROR;
+                            _write.error = info->ErrorCode.Value;
+                        }
+                        else
+                        {
+                            _write.count = 0;
+                        }
+                        _completedHandler(SocketOperationConnect);
+                    });
+            }
+        }
+        catch(Platform::Exception^ ex)
+        {
+            checkConnectErrorCode(__FILE__, __LINE__, ex->HResult, _connectAddr.host);
+        }
+        return false;
+    }
+
+    assert(!buf.b.empty());
+    assert(buf.i != buf.b.end());
+
+    int packetSize = static_cast<int>(buf.b.end() - buf.i);
+    if(_maxSendPacketSize > 0 && packetSize > _maxSendPacketSize)
+    { 
+        packetSize = _maxSendPacketSize;
+    }
+    assert(packetSize > 0);
+    _writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, packetSize));
+    try
+    {
+        DataWriterStoreOperation^ operation = _writer->StoreAsync();
+        if(checkIfErrorOrCompleted(SocketOperationWrite, operation))
+        {
+            _write.count = operation->GetResults();
+        }
+        else
+        {
+            operation->Completed = _writeOperationCompletedHandler;
+        }
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+    return packetSize == static_cast<int>(buf.b.end() - buf.i);
+}
+
+void
+IceInternal::StreamTransceiver::finishWrite(Buffer& buf)
+{
+    if(_state < StateConnected)
+    {
+        return;
+    }
+
+    if(_write.count == SOCKET_ERROR)
+    {
+        checkErrorCode(__FILE__, __LINE__, _write.error);
+    }
+
+    if(_traceLevels->network >= 3)
+    {
+        int packetSize = static_cast<int>(buf.b.end() - buf.i);
+        if(_maxSendPacketSize > 0 && packetSize > _maxSendPacketSize)
+        { 
+            packetSize = _maxSendPacketSize;
+        }
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "sent " << _write.count << " of " << packetSize << " bytes via " << typeToString(_type) << "\n"
+            << toString();
+    }
+    
+    if(_stats)
+    {
+        _stats->bytesSent(type(), _write.count);
+    }
+    buf.i += _write.count;
+}
+
+void
+IceInternal::StreamTransceiver::startRead(Buffer& buf)
+{
+    int packetSize = static_cast<int>(buf.b.end() - buf.i);
+    if(_maxReceivePacketSize > 0 && packetSize > _maxReceivePacketSize)
+    {
+        packetSize = _maxReceivePacketSize;
+    }
+    assert(!buf.b.empty() && buf.i != buf.b.end());
+
+    try
+    {
+        DataReaderLoadOperation^ operation = _reader->LoadAsync(packetSize);
+        if(checkIfErrorOrCompleted(SocketOperationRead, operation))
+        {
+            _read.count = operation->GetResults();
+        }
+        else
+        {
+            operation->Completed = _readOperationCompletedHandler;
+        }
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+}
+
+void
+IceInternal::StreamTransceiver::finishRead(Buffer& buf)
+{
+    if(_read.count == SOCKET_ERROR)
+    {
+        checkErrorCode(__FILE__, __LINE__, _read.error);
+    }
+    else if(_read.count == 0)
+    {
+        ConnectionLostException ex(__FILE__, __LINE__);
+        ex.error = 0;
+        throw ex;
+    }
+
+    try
+    {
+        auto data = ref new Platform::Array<unsigned char>(_read.count);
+        _reader->ReadBytes(data);
+        memcpy(&*buf.i, data->Data, _read.count);
+    }
+    catch(Platform::Exception^ ex)
+    {
+        checkErrorCode(__FILE__, __LINE__, ex->HResult);
+    }
+
+    if(_traceLevels->network >= 3)
+    {
+        int packetSize = static_cast<int>(buf.b.end() - buf.i);
+        if(_maxReceivePacketSize > 0 && packetSize > _maxReceivePacketSize)
+        {
+            packetSize = _maxReceivePacketSize;
+        }
+        Trace out(_logger, _traceLevels->networkCat);
+        out << "received " << _read.count << " of " << packetSize << " bytes via " << typeToString(_type) << "\n"
+            << toString();
+    }
+
+    if(_stats)
+    {
+        _stats->bytesReceived(type(), static_cast<Int>(_read.count));
+    }
+
+    buf.i += _read.count;
+}
+
+string
+IceInternal::StreamTransceiver::type() const
+{
+    return "tcp";
+}
+
+string
+IceInternal::StreamTransceiver::toString() const
+{
+    return _desc;
+}
+
+Ice::ConnectionInfoPtr 
+IceInternal::StreamTransceiver::getInfo() const
+{
+    assert(_fd != INVALID_SOCKET);
+    Ice::IPConnectionInfoPtr info;
+    if(_type == IceSSL::EndpointType)
+    {
+        info = new IceSSL::ConnectionInfo();
+    }
+    else
+    {
+        info = new Ice::TCPConnectionInfo();
+    }
+    fdToAddressAndPort(_fd, info->localAddress, info->localPort, info->remoteAddress, info->remotePort);
+    return info;
+}
+
+void
+IceInternal::StreamTransceiver::checkSendSize(const Buffer& buf, size_t messageSizeMax)
+{
+    if(buf.b.size() > messageSizeMax)
+    {
+        Ex::throwMemoryLimitException(__FILE__, __LINE__, buf.b.size(), messageSizeMax);
+    }
+}
+
+IceInternal::StreamTransceiver::StreamTransceiver(const InstancePtr& instance, 
+                                                  Ice::Short type, 
+                                                  SOCKET fd, 
+                                                  bool connected) :
+    NativeInfo(fd),
+    _traceLevels(instance->traceLevels()),
+    _type(type),
+    _logger(instance->initializationData().logger),
+    _stats(instance->initializationData().stats),
+    _state(connected ? StateConnected : StateNeedConnect),
+    _desc(connected ? fdToString(_fd) : string())
+{
+    StreamSocket^ streamSocket = safe_cast<StreamSocket^>(_fd);
+    _writer = ref new DataWriter(streamSocket->OutputStream);
+    _reader = ref new DataReader(streamSocket->InputStream);
+    _reader->InputStreamOptions = InputStreamOptions::Partial;
+
+    Ice::PropertiesPtr properties = instance->initializationData().properties;
+    setTcpBufSize(_fd, properties, _logger);
+
+    _maxSendPacketSize = streamSocket->Control->OutboundBufferSizeInBytes / 2;
+    if(_maxSendPacketSize < 512)
+    {
+        _maxSendPacketSize = 0;
+    }
+
+    _maxReceivePacketSize = properties->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", 128 * 1024);
+}
+
+IceInternal::StreamTransceiver::~StreamTransceiver()
+{
+    assert(_fd == INVALID_SOCKET);
+}
+
+void
+IceInternal::StreamTransceiver::connect(const Address& addr)
+{
+    _connectAddr = addr;
+}
+
+bool
+IceInternal::StreamTransceiver::checkIfErrorOrCompleted(SocketOperation op, IAsyncInfo^ info)
+{
+    //
+    // NOTE: It's important to only check for info->Status once as it
+    // might change during the checks below (the Status can be changed
+    // by the Windows thread pool concurrently).
+    //
+    // We consider that a canceled async status is the same as an
+    // error. A canceled async status can occur if there's a timeout
+    // and the socket is closed.
+    //
+    Windows::Foundation::AsyncStatus status = info->Status;
+    if(status == Windows::Foundation::AsyncStatus::Completed)
+    {
+        _completedHandler(op);
+        return true;
+    }
+    else if (status == Windows::Foundation::AsyncStatus::Started)
+    {
+        return false;
+    }
+    else
+    {
+        if(_state < StateConnected)
+        {
+            checkConnectErrorCode(__FILE__, __LINE__, info->ErrorCode.Value, _connectAddr.host);
+        }
+        else 
+        {
+            checkErrorCode(__FILE__, __LINE__, info->ErrorCode.Value);
+        }
+        return true; // Prevent compiler warning.
+    }
+}
diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h
new file mode 100644
index 00000000000..11d27eee6ff
--- /dev/null
+++ b/cpp/src/Ice/winrt/StreamTransceiver.h
@@ -0,0 +1,93 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_STREAM_TRANSCEIVER_H
+#define ICE_STREAM_TRANSCEIVER_H
+
+#include <Ice/InstanceF.h>
+#include <Ice/TraceLevelsF.h>
+#include <Ice/LoggerF.h>
+#include <Ice/StatsF.h>
+#include <Ice/Transceiver.h>
+#include <Ice/Network.h>
+
+namespace IceInternal
+{
+
+class StreamConnector;
+class StreamAcceptor;
+
+std::string typeToString(Ice::Short);
+
+class StreamTransceiver : public Transceiver, public NativeInfo
+{
+    enum State
+    {
+        StateNeedConnect,
+        StateConnectPending,
+        StateConnected
+    };
+
+public:
+
+    virtual NativeInfoPtr getNativeInfo();
+    virtual void setCompletedHandler(SocketOperationCompletedHandler^);
+    
+    virtual SocketOperation initialize();
+    virtual void close();
+    virtual bool write(Buffer&);
+    virtual bool read(Buffer&);
+
+    virtual bool startWrite(Buffer&);
+    virtual void finishWrite(Buffer&);
+    virtual void startRead(Buffer&);
+    virtual void finishRead(Buffer&);
+
+    virtual std::string type() const;
+    virtual std::string toString() const;
+    virtual Ice::ConnectionInfoPtr getInfo() const;
+    virtual void checkSendSize(const Buffer&, size_t);
+
+private:
+
+    StreamTransceiver(const InstancePtr&, Ice::Short, SOCKET, bool);
+    virtual ~StreamTransceiver();
+
+    void connect(const Address&);
+
+    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^);
+
+    friend class StreamConnector;
+    friend class StreamAcceptor;
+
+    const TraceLevelsPtr _traceLevels;
+    const Ice::Short _type;
+    const Ice::LoggerPtr _logger;
+    const Ice::StatsPtr _stats;
+    
+    State _state;
+    std::string _desc;
+    Address _connectAddr;
+
+    AsyncInfo _read;
+    AsyncInfo _write;
+    int _maxSendPacketSize;
+    int _maxReceivePacketSize;
+
+    Windows::Storage::Streams::DataReader^ _reader;
+    Windows::Storage::Streams::DataWriter^ _writer;
+
+    SocketOperationCompletedHandler^ _completedHandler;
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _readOperationCompletedHandler;
+    Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ _writeOperationCompletedHandler;
+};
+
+}
+
+#endif
diff --git a/cpp/src/IceGrid/AdapterCache.cpp b/cpp/src/IceGrid/AdapterCache.cpp
index 28572d48dd5..5a1f3d6528c 100644
--- a/cpp/src/IceGrid/AdapterCache.cpp
+++ b/cpp/src/IceGrid/AdapterCache.cpp
@@ -437,7 +437,8 @@ ReplicaGroupEntry::ReplicaGroupEntry(AdapterCache& cache,
                                      const string& application,
                                      const LoadBalancingPolicyPtr& policy) : 
     AdapterEntry(cache, id, application),
-    _lastReplica(0)
+    _lastReplica(0),
+    _requestInProgress(false)
 {
     update(policy);
 }
@@ -572,6 +573,12 @@ ReplicaGroupEntry::getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& n
         replicas.reserve(_replicas.size());
         if(RoundRobinLoadBalancingPolicyPtr::dynamicCast(_loadBalancing))
         {
+            // Serialize round-robin requests
+            while(_requestInProgress)
+            {
+                wait();
+            }
+            _requestInProgress = true;
             for(unsigned int i = 0; i < _replicas.size(); ++i)
             {
                 replicas.push_back(_replicas[(_lastReplica + i) % _replicas.size()]);
@@ -600,53 +607,78 @@ ReplicaGroupEntry::getLocatorAdapterInfo(LocatorAdapterInfoSeq& adapters, int& n
         }
     }
 
-    if(adaptive)
+    int unreachable = 0;
+    bool synchronizing = false;
+    try
     {
+        if(adaptive)
+        {
+            //
+            // This must be done outside the synchronization block since
+            // the trasnform() might call and lock each server adapter
+            // entry. We also can't sort directly as the load of each
+            // server adapter is not stable so we first take a snapshot of
+            // each adapter and sort the snapshot.
+            //
+            vector<pair<float, ServerAdapterEntryPtr> > rl;
+            transform(replicas.begin(), replicas.end(), back_inserter(rl), TransformToReplicaLoad(loadSample));
+            sort(rl.begin(), rl.end(), ReplicaLoadComp());
+            replicas.clear();
+            transform(rl.begin(), rl.end(), back_inserter(replicas), TransformToReplica());
+        }
+
         //
-        // This must be done outside the synchronization block since
-        // the trasnform() might call and lock each server adapter
-        // entry. We also can't sort directly as the load of each
-        // server adapter is not stable so we first take a snapshot of
-        // each adapter and sort the snapshot.
+        // Retrieve the proxy of each adapter from the server. The adapter
+        // might not exist anymore at this time or the node might not be
+        // reachable.
         //
-        vector<pair<float, ServerAdapterEntryPtr> > rl;
-        transform(replicas.begin(), replicas.end(), back_inserter(rl), TransformToReplicaLoad(loadSample));
-        sort(rl.begin(), rl.end(), ReplicaLoadComp());
-        replicas.clear();
-        transform(rl.begin(), rl.end(), back_inserter(replicas), TransformToReplica());
+        set<string> emptyExcludes;
+        bool firstUnreachable = true;
+        for(vector<ServerAdapterEntryPtr>::const_iterator p = replicas.begin(); p != replicas.end(); ++p)
+        {
+            if(!roundRobin || excludes.find((*p)->getId()) == excludes.end())
+            {
+                try
+                {
+                    int dummy;
+                    bool dummy2;
+                    bool dummy3;
+                    (*p)->getLocatorAdapterInfo(adapters, dummy, dummy2, dummy3, emptyExcludes);
+                    firstUnreachable = false;
+                }
+                catch(const SynchronizationException&)
+                {
+                    synchronizing = true;
+                }
+                catch(const Ice::UserException&)
+                {
+                    if(firstUnreachable)
+                    {
+                        ++unreachable; // Count the number of un-reachable nodes.
+                    }
+                }
+            }
+        }
+    }
+    catch(...)
+    {
+        if(roundRobin)
+        {
+            Lock sync(*this);
+            assert(_requestInProgress);
+            _requestInProgress = false;
+        }
+        throw;
     }
 
-    //
-    // Retrieve the proxy of each adapter from the server. The adapter
-    // might not exist anymore at this time or the node might not be
-    // reachable.
-    //
-    bool synchronizing = false;
-    set<string> emptyExcludes;
-    for(vector<ServerAdapterEntryPtr>::const_iterator p = replicas.begin(); p != replicas.end(); ++p)
+    if(roundRobin)
     {
-        if(!roundRobin || excludes.find((*p)->getId()) == excludes.end())
+        Lock sync(*this);
+        assert(_requestInProgress);
+        _requestInProgress = false;
+        if(unreachable > 0)
         {
-            try
-            {
-                int dummy;
-                bool dummy2;
-                bool dummy3;
-                (*p)->getLocatorAdapterInfo(adapters, dummy, dummy2, dummy3, emptyExcludes);
-            }
-            catch(const AdapterNotExistException&)
-            {
-            }
-            catch(const NodeUnreachableException&)
-            {
-            }
-            catch(const DeploymentException&)
-            {
-            }
-            catch(const SynchronizationException&)
-            {
-                synchronizing = true;
-            }
+            _lastReplica = (_lastReplica + unreachable) % static_cast<int>(_replicas.size());
         }
     }
 
diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 723a85ebbe4..9a42d62b645 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -91,7 +91,7 @@ private:
 };
 typedef IceUtil::Handle<ServerAdapterEntry> ServerAdapterEntryPtr;
 
-class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Mutex
+class ReplicaGroupEntry : public AdapterEntry, public IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -117,6 +117,7 @@ private:
     LoadSample _loadSample;
     std::vector<ServerAdapterEntryPtr> _replicas;
     int _lastReplica;
+    bool _requestInProgress;
 };
 typedef IceUtil::Handle<ReplicaGroupEntry> ReplicaGroupEntryPtr;
 
diff --git a/cpp/src/IceGridLib/winrt/.depend.mak b/cpp/src/IceGridLib/winrt/.depend.mak
new file mode 100644
index 00000000000..0336ab8d60b
--- /dev/null
+++ b/cpp/src/IceGridLib/winrt/.depend.mak
@@ -0,0 +1,21 @@
+$(ARCH)\$(CONFIG)\Admin$(OBJEXT): ..\Admin.cpp "$(includedir)\IceGrid\Admin.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\IceGrid\Descriptor.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Locator$(OBJEXT): ..\Locator.cpp "$(includedir)\IceGrid\Locator.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\Locator.h" "$(includedir)\Ice\ProcessF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Query$(OBJEXT): ..\Query.cpp "$(includedir)\IceGrid\Query.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Exception$(OBJEXT): ..\Exception.cpp "$(includedir)\IceGrid\Exception.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Descriptor$(OBJEXT): ..\Descriptor.cpp "$(includedir)\IceGrid\Descriptor.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\FileParser$(OBJEXT): ..\FileParser.cpp "$(includedir)\IceGrid\FileParser.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\IceGrid\Admin.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\IceGrid\Descriptor.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Observer$(OBJEXT): ..\Observer.cpp "$(includedir)\IceGrid\Observer.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\IceGrid\Descriptor.h" "$(includedir)\IceGrid\Admin.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Session$(OBJEXT): ..\Session.cpp "$(includedir)\IceGrid\Session.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Registry$(OBJEXT): ..\Registry.cpp "$(includedir)\IceGrid\Registry.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\IncomingAsync.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\IceGrid\Exception.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\IceGrid\Session.h" "$(includedir)\Glacier2\Session.h" "$(includedir)\Glacier2\SSLInfo.h" "$(includedir)\IceGrid\Admin.h" "$(includedir)\Ice\Properties.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceGrid\Descriptor.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\UserAccountMapper$(OBJEXT): ..\UserAccountMapper.cpp "$(includedir)\IceGrid\UserAccountMapper.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(HDIR)\Admin.h ..\Admin.cpp: "$(slicedir)\IceGrid\Admin.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\IceGrid\Exception.ice" "$(slicedir)\IceGrid\Descriptor.ice" "$(SLICE2CPP)"
+$(HDIR)\Exception.h ..\Exception.cpp: "$(slicedir)\IceGrid\Exception.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(HDIR)\FileParser.h ..\FileParser.cpp: "$(slicedir)\IceGrid\FileParser.ice" "$(slicedir)\IceGrid\Admin.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\IceGrid\Exception.ice" "$(slicedir)\IceGrid\Descriptor.ice" "$(SLICE2CPP)"
+$(HDIR)\Locator.h ..\Locator.cpp: "$(slicedir)\IceGrid\Locator.ice" "$(slicedir)\Ice\Locator.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\ProcessF.ice" "$(SLICE2CPP)"
+$(HDIR)\Query.h ..\Query.cpp: "$(slicedir)\IceGrid\Query.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\IceGrid\Exception.ice" "$(SLICE2CPP)"
+$(HDIR)\Registry.h ..\Registry.cpp: "$(slicedir)\IceGrid\Registry.ice" "$(slicedir)\IceGrid\Exception.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\IceGrid\Session.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\IceGrid\Admin.ice" "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(slicedir)\IceGrid\Descriptor.ice" "$(SLICE2CPP)"
+$(HDIR)\Session.h ..\Session.cpp: "$(slicedir)\IceGrid\Session.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\IceGrid\Exception.ice" "$(SLICE2CPP)"
+$(HDIR)\Observer.h ..\Observer.cpp: "$(slicedir)\IceGrid\Observer.ice" "$(slicedir)\Glacier2\Session.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Glacier2\SSLInfo.ice" "$(slicedir)\IceGrid\Exception.ice" "$(slicedir)\IceGrid\Descriptor.ice" "$(slicedir)\IceGrid\Admin.ice" "$(slicedir)\Ice\Properties.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(SLICE2CPP)"
+$(HDIR)\Descriptor.h ..\Descriptor.cpp: "$(slicedir)\IceGrid\Descriptor.ice" "$(slicedir)\Ice\Identity.ice" "$(slicedir)\Ice\BuiltinSequences.ice" "$(SLICE2CPP)"
+$(HDIR)\UserAccountMapper.h ..\UserAccountMapper.cpp: "$(slicedir)\IceGrid\UserAccountMapper.ice" "$(SLICE2CPP)"
+
diff --git a/cpp/src/IceGridLib/winrt/Makefile.mak b/cpp/src/IceGridLib/winrt/Makefile.mak
new file mode 100644
index 00000000000..a839fa32c32
--- /dev/null
+++ b/cpp/src/IceGridLib/winrt/Makefile.mak
@@ -0,0 +1,81 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir		= ..\..\..
+LIBNAME		= $(SDK_LIBRARY_PATH)\icegrid.lib
+TARGETS		= $(LIBNAME)
+SOURCE_DIR	= ..
+
+TARGETS         = $(LIBNAME)
+
+OBJS	= $(ARCH)\$(CONFIG)\Admin.obj \
+	   $(ARCH)\$(CONFIG)\Locator.obj \
+	   $(ARCH)\$(CONFIG)\Query.obj \
+	   $(ARCH)\$(CONFIG)\Exception.obj \
+	   $(ARCH)\$(CONFIG)\Descriptor.obj \
+           $(ARCH)\$(CONFIG)\FileParser.obj \
+	   $(ARCH)\$(CONFIG)\Observer.obj \
+	   $(ARCH)\$(CONFIG)\Session.obj \
+	   $(ARCH)\$(CONFIG)\Registry.obj \
+	   $(ARCH)\$(CONFIG)\UserAccountMapper.obj
+	   
+SLICE_SRCS	= $(SDIR)/Admin.ice \
+                  $(SDIR)/Exception.ice \
+                  $(SDIR)/FileParser.ice \
+                  $(SDIR)/Locator.ice \
+                  $(SDIR)/Query.ice \
+		  $(SDIR)/Registry.ice \
+		  $(SDIR)/Session.ice \
+		  $(SDIR)/Observer.ice \
+		  $(SDIR)/Descriptor.ice \
+		  $(SDIR)/UserAccountMapper.ice
+
+SRCS		= $(OBJS:.obj=.cpp)
+SRCS		= $(SRCS:x86\=)
+SRCS		= $(SRCS:x64\=)
+SRCS		= $(SRCS:Retail\=..\)
+SRCS		= $(SRCS:Debug\=..\)
+
+HDIR		= $(headerdir)\IceGrid
+SDIR		= $(slicedir)\IceGrid
+
+SLICE2CPPFLAGS	= --checksum --ice --include-dir IceGrid --dll-export ICE_GRID_API
+CPPFLAGS        = -I..\.. $(CPPFLAGS)
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+RES_FILE        = $(SOURCE_DIR)\IceGrid.res
+
+$(LIBNAME): $(OBJS) $(RES_FILE) sdks
+	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
+
+depend::
+	del /q .depend.mak
+
+.cpp.depend:
+	$(CXX) /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ /Zs /showIncludes $(CXXFLAGS) $(CPPFLAGS) $< 2>&1 | python.exe $(ice_dir)/config/makedepend-winrt.py  $<
+
+depend:: $(ARCH)\$(CONFIG) $(SLICE_SRCS) $(SRCS) $(SRCS_DEPEND)
+	@if not "$(SLICE_SRCS)" == "" \
+		$(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py
+
+clean::
+	-del /q $(SOURCE_DIR)\FileParser.cpp $(HDIR)\FileParser.h
+	-del /q $(SOURCE_DIR)\Admin.cpp $(HDIR)\Admin.h
+	-del /q $(SOURCE_DIR)\Descriptor.cpp $(HDIR)\Descriptor.h
+	-del /q $(SOURCE_DIR)\Exception.cpp $(HDIR)\Exception.h
+	-del /q $(SOURCE_DIR)\Locator.cpp $(HDIR)\Locator.h
+	-del /q $(SOURCE_DIR)\Observer.cpp $(HDIR)\Observer.h
+	-del /q $(SOURCE_DIR)\Query.cpp $(HDIR)\Query.h
+	-del /q $(SOURCE_DIR)\Session.cpp $(HDIR)\Session.h
+	-del /q $(SOURCE_DIR)\Registry.cpp $(HDIR)\Registry.h
+	-del /q $(SOURCE_DIR)\UserAccountMapper.cpp $(HDIR)\UserAccountMapper.h
+	-del /q $(RES_FILE)
+
+!include .depend.mak
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index 87284388e8e..4196200775b 100755
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -14,7 +14,6 @@
 #define ICE_PATCH2_API_EXPORTS
 #include <IcePatch2/ClientUtil.h>
 #include <IcePatch2/Util.h>
-#include <IcePatch2/FileServerI.h>
 #include <list>
 #include <iterator>
 
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp
index 295eb0f8c3c..96fc56f2d19 100644
--- a/cpp/src/IceSSL/AcceptorI.cpp
+++ b/cpp/src/IceSSL/AcceptorI.cpp
@@ -110,7 +110,7 @@ IceSSL::AcceptorI::startAccept()
     }        
 
     assert(_acceptFd == INVALID_SOCKET);
-    _acceptFd = IceInternal::createSocket(false, _addr.ss_family);
+    _acceptFd = IceInternal::createSocket(false, _addr);
     const int sz = static_cast<int>(_acceptBuf.size() / 2);
     if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count,
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // COMPILER FIX: VC60
@@ -226,7 +226,7 @@ IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const string& adapterN
     _backlog = instance->communicator()->getProperties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
 #endif
 
-    _fd = IceInternal::createSocket(false, _addr.ss_family);
+    _fd = IceInternal::createSocket(false, _addr);
 #ifdef ICE_USE_IOCP
     _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
 #endif
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp
index 9f42827313f..8c9857880fa 100644
--- a/cpp/src/IceSSL/ConnectorI.cpp
+++ b/cpp/src/IceSSL/ConnectorI.cpp
@@ -42,7 +42,7 @@ IceSSL::ConnectorI::connect()
 
     try
     {
-        return new TransceiverI(_instance, IceInternal::createSocket(false, _addr.ss_family), _host, _addr);
+        return new TransceiverI(_instance, IceInternal::createSocket(false, _addr), _host, _addr);
     }
     catch(const Ice::LocalException& ex)
     {
diff --git a/cpp/src/IceStormLib/winrt/.depend.mak b/cpp/src/IceStormLib/winrt/.depend.mak
new file mode 100644
index 00000000000..dda5c3c726e
--- /dev/null
+++ b/cpp/src/IceStormLib/winrt/.depend.mak
@@ -0,0 +1,3 @@
+$(ARCH)\$(CONFIG)\IceStorm$(OBJEXT): ..\IceStorm.cpp "$(includedir)\IceStorm\IceStorm.h" "$(includedir)\Ice\LocalObjectF.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\Ice\Handle.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\Ice\Config.h" "$(includedir)\Ice\ProxyF.h" "$(includedir)\Ice\ProxyHandle.h" "$(includedir)\Ice\ObjectF.h" "$(includedir)\Ice\Exception.h" "$(includedir)\Ice\LocalObject.h" "$(includedir)\Ice\Proxy.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\Ice\ProxyFactoryF.h" "$(includedir)\Ice\ConnectionIF.h" "$(includedir)\Ice\RequestHandlerF.h" "$(includedir)\Ice\EndpointIF.h" "$(includedir)\Ice\EndpointF.h" "$(includedir)\IceUtil\ScopedArray.h" "$(includedir)\Ice\UndefSysMacros.h" "$(includedir)\Ice\EndpointTypes.h" "$(includedir)\Ice\ObjectAdapterF.h" "$(includedir)\Ice\ReferenceF.h" "$(includedir)\Ice\OutgoingAsync.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\Ice\OutgoingAsyncF.h" "$(includedir)\Ice\InstanceF.h" "$(includedir)\Ice\CommunicatorF.h" "$(includedir)\Ice\Current.h" "$(includedir)\Ice\ConnectionF.h" "$(includedir)\Ice\Identity.h" "$(includedir)\Ice\BasicStream.h" "$(includedir)\Ice\ObjectFactoryF.h" "$(includedir)\Ice\Buffer.h" "$(includedir)\Ice\Protocol.h" "$(includedir)\Ice\StreamF.h" "$(includedir)\Ice\Object.h" "$(includedir)\Ice\GCShared.h" "$(includedir)\Ice\GCCountMap.h" "$(includedir)\Ice\IncomingAsyncF.h" "$(includedir)\Ice\Outgoing.h" "$(includedir)\Ice\Incoming.h" "$(includedir)\Ice\ServantLocatorF.h" "$(includedir)\Ice\ServantManagerF.h" "$(includedir)\Ice\Direct.h" "$(includedir)\Ice\FactoryTableInit.h" "$(includedir)\Ice\FactoryTable.h" "$(includedir)\Ice\UserExceptionFactory.h" "$(includedir)\Ice\SliceChecksumDict.h" "$(includedir)\Ice\LocalException.h" "$(includedir)\Ice\BuiltinSequences.h" "$(includedir)\Ice\Stream.h" "$(includedir)\Ice\ObjectFactory.h" "$(includedir)\Ice\SliceChecksums.h" "$(includedir)\IceUtil\Iterator.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(HDIR)\IceStorm.h ..\IceStorm.cpp: "$(slicedir)\IceStorm\IceStorm.ice" "$(slicedir)\Ice\SliceChecksumDict.ice" "$(SLICE2CPP)"
+
diff --git a/cpp/src/IceStormLib/winrt/Makefile.mak b/cpp/src/IceStormLib/winrt/Makefile.mak
new file mode 100644
index 00000000000..f51ea21a99d
--- /dev/null
+++ b/cpp/src/IceStormLib/winrt/Makefile.mak
@@ -0,0 +1,55 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir		= ..\..\..
+LIBNAME		= $(SDK_LIBRARY_PATH)\icestorm.lib
+TARGETS		= $(LIBNAME)
+SOURCE_DIR	= ..
+
+TARGETS         = $(LIBNAME)
+
+OBJS		= $(ARCH)\$(CONFIG)\IceStorm.obj
+
+SLICE_SRCS	= $(SDIR)/IceStorm.ice
+
+SRCS		= $(OBJS:.obj=.cpp)
+SRCS		= $(SRCS:x86\=)
+SRCS		= $(SRCS:x64\=)
+SRCS		= $(SRCS:Retail\=..\)
+SRCS		= $(SRCS:Debug\=..\)
+
+HDIR		= $(headerdir)\IceStorm
+SDIR		= $(slicedir)\IceStorm
+
+CPPFLAGS	= -I..\.. -DWIN32_LEAN_AND_MEAN
+ICECPPFLAGS	= -I..
+SLICE2CPPFLAGS	= --ice --include-dir IceStorm --checksum --dll-export ICE_STORM_LIB_API
+
+!include $(top_srcdir)\config\Make.rules.mak
+
+RES_FILE        = $(SOURCE_DIR)\IceStorm.res
+
+$(LIBNAME): $(OBJS) $(RES_FILE) sdks
+	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
+
+depend::
+	del /q .depend.mak
+
+.cpp.depend:
+	$(CXX) /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ /Zs /showIncludes $(CXXFLAGS) $(CPPFLAGS) $< 2>&1 | python.exe $(ice_dir)/config/makedepend-winrt.py  $<
+
+depend:: $(ARCH)\$(CONFIG) $(SLICE_SRCS) $(SRCS) $(SRCS_DEPEND)
+	@if not "$(SLICE_SRCS)" == "" \
+		$(SLICE2CPP) --depend $(SLICE2CPPFLAGS) $(SLICE_SRCS) | python.exe $(ice_dir)\config\makedepend-winrt.py
+
+clean::
+	-del /q $(SOURCE_DIR)\IceStorm.cpp $(HDIR)\IceStorm.h
+	-del /q $(RES_FILE)
+
+!include .depend.mak
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index 22330c25916..a0f71460f1e 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -17,7 +17,11 @@
 
 IceUtilInternal::Semaphore::Semaphore(long initial)
 {
+#ifndef ICE_OS_WINRT
     _sem = CreateSemaphore(0, initial, 0x7fffffff, 0);
+#else
+    _sem = CreateSemaphoreExW(0, initial, 0x7fffffff, 0, 0, SEMAPHORE_ALL_ACCESS);
+#endif
     if(_sem == INVALID_HANDLE_VALUE)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -32,7 +36,11 @@ IceUtilInternal::Semaphore::~Semaphore()
 void
 IceUtilInternal::Semaphore::wait() const
 {
+#ifndef ICE_OS_WINRT
     DWORD rc = WaitForSingleObject(_sem, INFINITE);
+#else
+    DWORD rc = WaitForSingleObjectEx(_sem, INFINITE, true);
+#endif
     if(rc != WAIT_OBJECT_0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -48,7 +56,11 @@ IceUtilInternal::Semaphore::timedWait(const IceUtil::Time& timeout) const
         throw IceUtil::InvalidTimeoutException(__FILE__, __LINE__, timeout);
     } 
 
+#ifndef ICE_OS_WINRT
     DWORD rc = WaitForSingleObject(_sem, static_cast<DWORD>(msTimeout));
+#else
+    DWORD rc = WaitForSingleObjectEx(_sem, static_cast<DWORD>(msTimeout), true);
+#endif
     if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
diff --git a/cpp/src/IceUtil/CountDownLatch.cpp b/cpp/src/IceUtil/CountDownLatch.cpp
index abc3525f0c9..05e6be3d5df 100644
--- a/cpp/src/IceUtil/CountDownLatch.cpp
+++ b/cpp/src/IceUtil/CountDownLatch.cpp
@@ -19,7 +19,11 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     }
 
 #ifdef _WIN32
+#   ifndef ICE_OS_WINRT
     _event = CreateEvent(0, TRUE, FALSE, 0);
+#   else
+    _event = CreateEventExW(0, 0,  CREATE_EVENT_MANUAL_RESET, SEMAPHORE_ALL_ACCESS);
+#   endif
     if(_event == 0)
     {
         throw  IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -58,7 +62,11 @@ IceUtilInternal::CountDownLatch::await() const
 #ifdef _WIN32
     while(InterlockedExchangeAdd(&_count, 0) > 0)
     {
+#   ifndef ICE_OS_WINRT
         DWORD rc = WaitForSingleObject(_event, INFINITE);
+#   else
+        DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);
+#   endif
         assert(rc == WAIT_OBJECT_0 || rc == WAIT_FAILED);
         
         if(rc == WAIT_FAILED)
diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp
index b7fec74f7ea..2ecc670051f 100644
--- a/cpp/src/IceUtil/FileUtil.cpp
+++ b/cpp/src/IceUtil/FileUtil.cpp
@@ -151,6 +151,7 @@ IceUtilInternal::open(const string& path, int flags)
     }
 }
 
+#ifndef ICE_OS_WINRT
 int
 IceUtilInternal::getcwd(string& cwd)
 {
@@ -162,6 +163,7 @@ IceUtilInternal::getcwd(string& cwd)
     cwd = IceUtil::wstringToString(cwdbuf);
     return 0;
 }
+#endif
 
 int
 IceUtilInternal::unlink(const string& path)
@@ -183,8 +185,15 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
     _fd(INVALID_HANDLE_VALUE),
     _path(path)
 {
+#ifndef ICE_OS_WINRT
     _fd = ::CreateFileW(IceUtil::stringToWstring(path).c_str(), GENERIC_WRITE, 0, NULL,
                         OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+#else
+    CREATEFILE2_EXTENDED_PARAMETERS params;
+    params.dwFileAttributes = FILE_ATTRIBUTE_NORMAL;
+    _fd = ::CreateFile2(IceUtil::stringToWstring(path).c_str(), GENERIC_WRITE, 0,
+                        OPEN_ALWAYS, &params);
+#endif
     _path = path;
 
     if(_fd == INVALID_HANDLE_VALUE)
@@ -192,7 +201,13 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) :
         throw IceUtil::FileLockException(__FILE__, __LINE__, GetLastError(), _path);
     }
 
-    if(::LockFile(_fd, 0, 0, 0, 0) == 0)
+    OVERLAPPED overlaped;
+    overlaped.Internal = 0;
+    overlaped.InternalHigh = 0;
+    overlaped.Offset = 0;
+    overlaped.OffsetHigh = 0;
+    overlaped.hEvent = nullptr;
+    if(::LockFileEx(_fd, LOCKFILE_EXCLUSIVE_LOCK | LOCKFILE_FAIL_IMMEDIATELY, 0, 0, 0, &overlaped) == 0)
     {
         ::CloseHandle(_fd);
         throw IceUtil::FileLockException(__FILE__, __LINE__, GetLastError(), _path);
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index e7d63a374a2..c632f4b7b63 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -33,7 +33,7 @@ IceUtil::RecMutex::RecMutex(const IceUtil::MutexProtocol protocol) :
 void
 IceUtil::RecMutex::init(const MutexProtocol)
 {
-    InitializeCriticalSection(&_mutex);
+    InitializeCriticalSectionEx(&_mutex, 0, 0);
 }
 
 IceUtil::RecMutex::~RecMutex()
diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp
index 64237c25a41..0be8561f18d 100644
--- a/cpp/src/IceUtil/StringUtil.cpp
+++ b/cpp/src/IceUtil/StringUtil.cpp
@@ -497,31 +497,79 @@ IceUtilInternal::errorToString(int error, LPCVOID source)
 {
     if(error < WSABASEERR)
     {
+#ifndef ICE_OS_WINRT
         LPVOID lpMsgBuf = 0;
-        DWORD ok = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                                 FORMAT_MESSAGE_FROM_SYSTEM |
+#else
+        int size = 256;
+        auto_ptr<BYTE> lpMsgBuf = auto_ptr<BYTE>(new BYTE[size]);
+#endif
+        DWORD ok = 0;
+#ifdef ICE_OS_WINRT
+	while(true)
+        {
+#endif
+		ok = FormatMessageW(
+#ifndef ICE_OS_WINRT
+                                FORMAT_MESSAGE_ALLOCATE_BUFFER |
+#endif
+				FORMAT_MESSAGE_FROM_SYSTEM |
                                  FORMAT_MESSAGE_IGNORE_INSERTS | 
                                  (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0),
                                  source,
                                  error,
                                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-                                 (LPTSTR)&lpMsgBuf,
+#ifndef ICE_OS_WINRT
+				 (LPWSTR)&lpMsgBuf,
+#else
+                                 (LPWSTR)lpMsgBuf.get(),
+#endif
                                  0,
                                  NULL);
+#ifdef ICE_OS_WINRT
+		if(!ok && size < 65536)
+		{
+			DWORD err = GetLastError();
+			if(err == ERROR_INSUFFICIENT_BUFFER)
+			{
+			     size *= 4;
+			     size = max(size, 65536);
+			     lpMsgBuf = auto_ptr<BYTE>(new BYTE[size]);
+			     continue;
+			}
+		}
+		break;
+	}
+#endif
+
         if(ok)
         {
-            LPCTSTR msg = (LPCTSTR)lpMsgBuf;
-            assert(msg && strlen((const char*)msg) > 0);
-            string result = (const char*)msg;
+#ifndef ICE_OS_WINRT
+            LPWSTR msg = (LPWSTR)lpMsgBuf;
+#else
+            LPWSTR msg = (LPWSTR)lpMsgBuf.get();
+#endif
+            assert(msg && wcslen((const wchar_t*)msg) > 0);
+            wstring result = (const wchar_t*)msg;
             if(result[result.length() - 1] == '\n')
             {
                 result = result.substr(0, result.length() - 2);
             }
-            LocalFree(lpMsgBuf);
-            return result;
+#ifndef ICE_OS_WINRT
+	    if(lpMsgBuf)
+	    {
+                LocalFree(lpMsgBuf);
+	    }
+#endif
+            return IceUtil::wstringToString(result);
         }
         else
         {
+#ifndef ICE_OS_WINRT
+	    if(lpMsgBuf)
+	    {
+                LocalFree(lpMsgBuf);
+	    }
+#endif
             ostringstream os;
             os << "unknown error: " << error;
             return os.str();
diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp
index 8e4fd2303a0..a629586a43b 100644
--- a/cpp/src/IceUtil/Thread.cpp
+++ b/cpp/src/IceUtil/Thread.cpp
@@ -63,7 +63,11 @@ IceUtil::ThreadControl::join()
         throw BadThreadControlException(__FILE__, __LINE__);
     }
 
+#ifndef ICE_OS_WINRT
     DWORD rc = WaitForSingleObject(_handle, INFINITE);
+#else
+    DWORD rc = WaitForSingleObjectEx(_handle, INFINITE, true);
+#endif
     if(rc != WAIT_OBJECT_0)
     {
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -95,7 +99,11 @@ IceUtil::ThreadControl::id() const
 void
 IceUtil::ThreadControl::sleep(const Time& timeout)
 {
+#ifndef ICE_OS_WINRT
     Sleep(static_cast<long>(timeout.toMilliSeconds()));
+#else
+    WaitForSingleObjectEx(GetCurrentThread(), static_cast<long>(timeout.toMilliSeconds()), true);
+#endif
 }
 
 void
@@ -106,7 +114,11 @@ IceUtil::ThreadControl::yield()
     // of its time slice to any other thread of equal priority that is
     // ready to run.
     //
+#ifndef ICE_OS_WINRT
     Sleep(0);
+#else
+    WaitForSingleObjectEx(GetCurrentThread(), 0, true);
+#endif
 }
 
 IceUtil::Thread::Thread() :
@@ -172,7 +184,7 @@ WINAPI startHook(void* arg)
 #if defined(_MSC_VER) && (_MSC_VER < 1300)
         terminate();
 #else
-	std::terminate();
+        std::terminate();
 #endif
     }
 
@@ -220,14 +232,21 @@ IceUtil::Thread::start(size_t stackSize, int priority)
         reinterpret_cast<HANDLE>(
             _beginthreadex(0, 
                             static_cast<unsigned int>(stackSize), 
-                            startHook, this, CREATE_SUSPENDED, &id));
+                            startHook, this, 
+#ifndef ICE_OS_WINRT
+                            CREATE_SUSPENDED, 
+#else
+                            0,
+#endif
+                            &id));
     _id = id;
-
+    assert(_handle != (HANDLE)-1L);
     if(_handle == 0)
     {
         __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
+#ifndef ICE_OS_WINRT
     if(SetThreadPriority(_handle, priority) == 0)
     {
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -237,6 +256,7 @@ IceUtil::Thread::start(size_t stackSize, int priority)
         __decRef();
         throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
     }
+#endif
 
     _started = true;
     _running = true;
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index 9fe8f703498..cb2d77a1992 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -14,17 +14,18 @@
 // (/dev/random) to generate "version 4" UUIDs, as described in 
 // http://www.ietf.org/internet-drafts/draft-mealling-uuid-urn-00.txt
 
+#include <IceUtil/Random.h>
+
 #ifdef _WIN32
 #   include <rpc.h>
 #else
-#   include <IceUtil/Random.h>
 #   include <sys/types.h>
 #   include <unistd.h>
 #endif
 
 using namespace std;
 
-#ifndef _WIN32
+#if defined(ICE_OS_WINRT) || !defined(_WIN32)
 
 namespace
 {
@@ -45,7 +46,11 @@ public:
     
     PidInitializer()
     {
+#ifndef _WIN32
         pid_t p = getpid();
+#else
+        int p = GetCurrentProcessId();
+#endif
         myPid[0] = (p >> 8) & 0x7F;
         myPid[1] = p & 0xFF;
     }
@@ -87,15 +92,22 @@ inline void bytesToHex(unsigned char* bytes, size_t len, char*& hexBuffer)
 string
 IceUtil::generateUUID()
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ICE_OS_WINRT)
 
     UUID uuid;
-    UuidCreate(&uuid);
+    RPC_STATUS ret = UuidCreate(&uuid);
+    if(ret != RPC_S_OK && ret != RPC_S_UUID_LOCAL_ONLY && ret != RPC_S_UUID_NO_ADDRESS)
+    {
+	throw new SyscallException(__FILE__, __LINE__, GetLastError());
+    }
 
     unsigned char* str;
 
-    UuidToString(&uuid, &str);
-
+    ret = UuidToString(&uuid, &str);
+    if(ret != RPC_S_OK)
+    {
+	throw new SyscallException(__FILE__, __LINE__, GetLastError());
+    }
     string result = reinterpret_cast<char*>(str);
 
     RpcStringFree(&str);
diff --git a/cpp/src/IceUtil/winrt/.depend.mak b/cpp/src/IceUtil/winrt/.depend.mak
new file mode 100644
index 00000000000..eaaf19abe78
--- /dev/null
+++ b/cpp/src/IceUtil/winrt/.depend.mak
@@ -0,0 +1,20 @@
+$(ARCH)\$(CONFIG)\ArgVector$(OBJEXT): ..\ArgVector.cpp "$(includedir)\IceUtil\ArgVector.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\DisableWarnings.h"
+$(ARCH)\$(CONFIG)\Cond$(OBJEXT): ..\Cond.cpp "$(includedir)\IceUtil\Cond.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\MutexProtocol.h"
+$(ARCH)\$(CONFIG)\ConvertUTF$(OBJEXT): ..\ConvertUTF.cpp "..\..\IceUtil\ConvertUTF.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Exception.h"
+$(ARCH)\$(CONFIG)\CountDownLatch$(OBJEXT): ..\CountDownLatch.cpp "$(includedir)\IceUtil\CountDownLatch.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h"
+$(ARCH)\$(CONFIG)\Exception$(OBJEXT): ..\Exception.cpp "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\MutexPtrLock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\FileUtil$(OBJEXT): ..\FileUtil.cpp "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\IceUtil\FileUtil.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Unicode.h"
+$(ARCH)\$(CONFIG)\InputUtil$(OBJEXT): ..\InputUtil.cpp "$(includedir)\IceUtil\InputUtil.h" "$(includedir)\IceUtil\Config.h"
+$(ARCH)\$(CONFIG)\Options$(OBJEXT): ..\Options.cpp "$(includedir)\IceUtil\Options.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\StringUtil.h"
+$(ARCH)\$(CONFIG)\OutputUtil$(OBJEXT): ..\OutputUtil.cpp "$(includedir)\IceUtil\OutputUtil.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\FileUtil.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h"
+$(ARCH)\$(CONFIG)\Random$(OBJEXT): ..\Random.cpp "$(includedir)\IceUtil\Random.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\MutexPtrLock.h"
+$(ARCH)\$(CONFIG)\RecMutex$(OBJEXT): ..\RecMutex.cpp "$(includedir)\IceUtil\RecMutex.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h"
+$(ARCH)\$(CONFIG)\Shared$(OBJEXT): ..\Shared.cpp "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h"
+$(ARCH)\$(CONFIG)\StringUtil$(OBJEXT): ..\StringUtil.cpp "$(includedir)\IceUtil\StringUtil.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\Exception.h"
+$(ARCH)\$(CONFIG)\Thread$(OBJEXT): ..\Thread.cpp "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h"
+$(ARCH)\$(CONFIG)\ThreadException$(OBJEXT): ..\ThreadException.cpp "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Time.h"
+$(ARCH)\$(CONFIG)\Time$(OBJEXT): ..\Time.cpp "$(includedir)\IceUtil\DisableWarnings.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Time.h"
+$(ARCH)\$(CONFIG)\Timer$(OBJEXT): ..\Timer.cpp "$(includedir)\IceUtil\Timer.h" "$(includedir)\IceUtil\Shared.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Thread.h" "$(includedir)\IceUtil\Handle.h" "$(includedir)\IceUtil\Exception.h" "$(includedir)\IceUtil\Mutex.h" "$(includedir)\IceUtil\Lock.h" "$(includedir)\IceUtil\ThreadException.h" "$(includedir)\IceUtil\Time.h" "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Monitor.h" "$(includedir)\IceUtil\Cond.h"
+$(ARCH)\$(CONFIG)\UUID$(OBJEXT): ..\UUID.cpp "$(includedir)\IceUtil\UUID.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Random.h" "$(includedir)\IceUtil\Exception.h"
+$(ARCH)\$(CONFIG)\Unicode$(OBJEXT): ..\Unicode.cpp "$(includedir)\IceUtil\Unicode.h" "$(includedir)\IceUtil\Config.h" "$(includedir)\IceUtil\Exception.h" "..\..\IceUtil\ConvertUTF.h"
+$(ARCH)\$(CONFIG)\MutexProtocol$(OBJEXT): ..\MutexProtocol.cpp "$(includedir)\IceUtil\MutexProtocol.h" "$(includedir)\IceUtil\Config.h"
diff --git a/cpp/src/IceUtil/winrt/Makefile.mak b/cpp/src/IceUtil/winrt/Makefile.mak
new file mode 100644
index 00000000000..abfbd31bcbc
--- /dev/null
+++ b/cpp/src/IceUtil/winrt/Makefile.mak
@@ -0,0 +1,66 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+top_srcdir	= ..\..\..
+LIBNAME		= $(SDK_LIBRARY_PATH)\iceutil.lib
+TARGETS		= $(LIBNAME)
+SOURCE_DIR	= ..
+
+TARGETS		= $(LIBNAME)
+
+OBJS		= $(ARCH)\$(CONFIG)\ArgVector.obj \
+                  $(ARCH)\$(CONFIG)\Cond.obj \
+                  $(ARCH)\$(CONFIG)\ConvertUTF.obj \
+		  $(ARCH)\$(CONFIG)\CountDownLatch.obj \
+		  $(ARCH)\$(CONFIG)\Exception.obj \
+		  $(ARCH)\$(CONFIG)\FileUtil.obj \
+		  $(ARCH)\$(CONFIG)\InputUtil.obj \
+		  $(ARCH)\$(CONFIG)\Options.obj \
+		  $(ARCH)\$(CONFIG)\OutputUtil.obj \
+		  $(ARCH)\$(CONFIG)\Random.obj \
+		  $(ARCH)\$(CONFIG)\RecMutex.obj \
+		  $(ARCH)\$(CONFIG)\Shared.obj \
+		  $(ARCH)\$(CONFIG)\StringUtil.obj \
+		  $(ARCH)\$(CONFIG)\Thread.obj \
+		  $(ARCH)\$(CONFIG)\ThreadException.obj \
+		  $(ARCH)\$(CONFIG)\Time.obj \
+		  $(ARCH)\$(CONFIG)\Timer.obj \
+		  $(ARCH)\$(CONFIG)\UUID.obj \
+		  $(ARCH)\$(CONFIG)\Unicode.obj \
+		  $(ARCH)\$(CONFIG)\MutexProtocol.obj
+
+SRCS		= $(OBJS:.obj=.cpp)
+SRCS		= $(SRCS:x86\=)
+SRCS		= $(SRCS:x64\=)
+SRCS		= $(SRCS:Retail\=..\)
+SRCS		= $(SRCS:Debug\=..\)
+
+CPPFLAGS        = $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I..\.. -DWIN32_LEAN_AND_MEAN
+
+!include $(top_srcdir)/config/Make.rules.mak
+
+depend::
+	del /q .depend.mak
+
+.cpp.depend:
+	$(CXX) /Fo$(ARCH)\$(CONFIG)\ /Fd$(ARCH)\$(CONFIG)\ /Zs /showIncludes $(CXXFLAGS) $(CPPFLAGS) $< 2>&1 | python.exe $(ice_dir)/config/makedepend-winrt.py $<
+
+depend:: $(ARCH)\$(CONFIG) $(SRCS_DEPEND)
+
+RES_FILE 	= $(SOURCE_DIR)\IceUtil.res
+
+$(LIBNAME): $(OBJS) $(RES_FILE) sdks
+	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
+
+clean::
+	-del /q $(ARCH)\$(CONFIG)\*.obj
+	-del /q $(ARCH)\$(CONFIG)\*.pdb
+	-del /q $(RES_FILE)
+
+!include .depend.mak
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index f05958d22c2..0679c275d92 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -11,6 +11,14 @@ top_srcdir	= ..
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" == "yes"
+SUBDIRS		= IceUtil\winrt \
+		  Ice\winrt \
+		  Glacier2Lib\winrt \
+		  IceStormLib\winrt \
+		  IceGridLib\winrt
+
+!else
 SUBDIRS		= IceUtil \
 		  Slice \
 		  slice2cpp
@@ -65,6 +73,8 @@ SUBDIRS		= $(SUBDIRS) \
 
 !endif
 
+!endif
+
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
 	    @if exist %i \
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index 9b9cf36490c..aa35affc81b 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -10,6 +10,7 @@
 #include <Slice/CPlusPlusUtil.h>
 #include <Slice/Util.h>
 #include <cstring>
+#include <functional>
 
 #ifndef _WIN32
 #  include <fcntl.h>
diff --git a/cpp/src/Slice/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp
index 09b47cc03d9..64106ad98a2 100644
--- a/cpp/src/Slice/PHPUtil.cpp
+++ b/cpp/src/Slice/PHPUtil.cpp
@@ -8,6 +8,7 @@
 // **********************************************************************
 
 #include <Slice/PHPUtil.h>
+#include <functional>
 
 using namespace std;
 using namespace Slice;
diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak
index 4b903650283..4b61e7d7d66 100644
--- a/cpp/test/Ice/Makefile.mak
+++ b/cpp/test/Ice/Makefile.mak
@@ -18,33 +18,33 @@ SUBDIRS		= proxy \
 		  inheritance \
 		  facets \
 		  objects \
-		  faultTolerance \
 		  location \
 		  adapterDeactivation \
-		  slicing \
-		  gc \
-		  checksum \
+		  ami \
+		  invoke \
 		  dispatcher \
 		  hold \
 		  binding \
 		  retry \
 		  timeout \
-		  servantLocator \
-		  interceptor \
-		  stringConverter \
-		  background \
 		  udp \
-		  defaultServant \
-		  defaultValue \
-		  threadPoolPriority \
 		  stream \
 
-!if "$(CPP_COMPILER)" != "VC60"
+!if "$(WINRT)" != "yes"
 SUBDIRS		= $(SUBDIRS) \
-		  ami \
+		  gc \
+		  slicing \
+		  faultTolerance \
+		  checksum \
+		  stringConverter \
+		  background \
+		  threadPoolPriority
 		  custom \
-		  invoke \
-		  properties
+		  properties \
+		  servantLocator \
+		  defaultServant \
+		  interceptor \
+		  defaultValue \
 !endif
 
 $(EVERYTHING)::
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index b682a0a4fbf..9bc445e585a 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -10,29 +10,52 @@
 #include <Ice/Application.h>
 #include <TestCommon.h>
 #include <Test.h>
+#include <string>
+#include <iostream>
+
+DEFINE_TEST("client")
 
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class TestClient : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
 int
-main(int argc, char* argv[])
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    TestClient app;
-    return app.main(argc, argv);
+    TestIntfPrx allTests(const CommunicatorPtr&);
+    TestIntfPrx obj = allTests(communicator);
+    return EXIT_SUCCESS;
 }
 
 int
-TestClient::run(int argc, char* argv[])
+main(int argc, char* argv[])
 {
-    TestIntfPrx allTests(const CommunicatorPtr&);
-    TestIntfPrx obj = allTests(communicator());
-    return EXIT_SUCCESS;
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        communicator = Ice::initialize(argc, argv);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
 }
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index db661130750..5f8f66605ba 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -12,35 +12,56 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 using namespace Ice;
 using namespace Test;
 
-class TestServer : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
-int
-main(int argc, char* argv[])
-{
-    TestServer app;
-    return app.main(argc, argv);
-}
-
 int
-TestServer::run(int argc, char* argv[])
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
     adapter->addServantLocator(locator, "");
 
     TestIntfPrx allTests(const CommunicatorPtr&);
-    allTests(communicator());
+    allTests(communicator);
 
     adapter->waitForDeactivate();
     return EXIT_SUCCESS;
 }
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        communicator = Ice::initialize(argc, argv);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
+}
diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mak b/cpp/test/Ice/adapterDeactivation/Makefile.mak
index c0bc82df8c1..7ef038bb072 100644
--- a/cpp/test/Ice/adapterDeactivation/Makefile.mak
+++ b/cpp/test/Ice/adapterDeactivation/Makefile.mak
@@ -9,11 +9,19 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_adapterDeactivation_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -38,24 +46,30 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index bfb0ba05c12..e9ab9171ffd 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -11,32 +11,53 @@
 #include <ServantLocatorI.h>
 #include <TestCommon.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 using namespace Ice;
 
-class TestServer : public Application
-{
-public:
-
-    virtual int run(int, char*[]);
-};
-
-int
-main(int argc, char* argv[])
-{
-    TestServer app;
-    return app.main(argc, argv);
-}
-
 int
-TestServer::run(int argc, char* argv[])
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
-    communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
-    Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter");
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
+    Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     ServantLocatorPtr locator = new ServantLocatorI;
-    
     adapter->addServantLocator(locator, "");
     adapter->activate();
+    TEST_READY
     adapter->waitForDeactivate();
     return EXIT_SUCCESS;
 }
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        communicator = Ice::initialize(argc, argv);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
+}
diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index c6774b607ac..8f4319fc795 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/ami/Makefile.mak b/cpp/test/Ice/ami/Makefile.mak
index 14343d3dbc3..d28a4900a3f 100644
--- a/cpp/test/Ice/ami/Makefile.mak
+++ b/cpp/test/Ice/ami/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_ami_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp
index eb0c8f39160..d480ee85390 100644
--- a/cpp/test/Ice/ami/Server.cpp
+++ b/cpp/test/Ice/ami/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -30,6 +33,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter2->add(testController, communicator->stringToIdentity("testController"));
     adapter2->activate();
     
+    TEST_READY
+
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/binding/Client.cpp b/cpp/test/Ice/binding/Client.cpp
index 936ddf29102..f8aa8a77a3a 100644
--- a/cpp/test/Ice/binding/Client.cpp
+++ b/cpp/test/Ice/binding/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/binding/Makefile.mak b/cpp/test/Ice/binding/Makefile.mak
index 14343d3dbc3..4a7fa619a81 100644
--- a/cpp/test/Ice/binding/Makefile.mak
+++ b/cpp/test/Ice/binding/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_binding_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp
index 0f913377504..a5251728ce3 100644
--- a/cpp/test/Ice/binding/Server.cpp
+++ b/cpp/test/Ice/binding/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -21,6 +24,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter->add(new RemoteCommunicatorI(), id);
     adapter->activate();
 
+    TEST_READY
+
     // Disable ready print for further adapters.
     communicator->getProperties()->setProperty("Ice.PrintAdapterReady", "0");
 
diff --git a/cpp/test/Ice/defaultValue/Makefile.mak b/cpp/test/Ice/defaultValue/Makefile.mak
index f6bed986542..c36c0e709c2 100644
--- a/cpp/test/Ice/defaultValue/Makefile.mak
+++ b/cpp/test/Ice/defaultValue/Makefile.mak
@@ -19,7 +19,7 @@ LOBJS 		= Test.obj
 
 COBJS		= Client.obj \
 		  AllTests.obj
-		  
+
 
 SRCS		= $(LOBJS:.obj=.cpp) \
 		   $(COBJS:.obj=.cpp)
@@ -37,7 +37,7 @@ SLICE2CPPFLAGS	= --dll-export TEST_API $(SLICE2CPPFLAGS)
 LINKWITH        = $(LIBS)
 
 $(LIBNAME): $(DLLNAME)
-	    
+
 $(DLLNAME): $(LOBJS)
 	$(LINK) $(BASE):0x22000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(LOBJS) $(PREOUT)$@ $(PRELIBS)$(LINKWITH)
 	move $(DLLNAME:.dll=.lib) $(LIBNAME)
diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index a3bf114ccf1..da86ee480af 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -12,6 +12,8 @@
 #include <Test.h>
 #include <Dispatcher.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/dispatcher/Makefile.mak b/cpp/test/Ice/dispatcher/Makefile.mak
index 20375556902..a40efbec458 100644
--- a/cpp/test/Ice/dispatcher/Makefile.mak
+++ b/cpp/test/Ice/dispatcher/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_dispatcher_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -31,18 +39,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp
index 517103c3898..e517301982b 100644
--- a/cpp/test/Ice/dispatcher/Server.cpp
+++ b/cpp/test/Ice/dispatcher/Server.cpp
@@ -9,8 +9,11 @@
 
 #include <Ice/Ice.h>
 #include <TestI.h>
+#include <TestCommon.h>
 #include <Dispatcher.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -30,7 +33,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     
     adapter2->add(testController, communicator->stringToIdentity("testController"));
     adapter2->activate();
-    
+
+    TEST_READY
+
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index 690b1f75f5e..93f08ea904c 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 797a9fc1802..9218c15a392 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated");
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/exceptions/Makefile.mak b/cpp/test/Ice/exceptions/Makefile.mak
index 1de0e30bfe1..9fb8ad0a707 100644
--- a/cpp/test/Ice/exceptions/Makefile.mak
+++ b/cpp/test/Ice/exceptions/Makefile.mak
@@ -9,12 +9,20 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-SERVERAMD	= serveramd.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_exceptions_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+SERVERAMD	= $(NAME_PREFIX)serveramd
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(SERVERAMD)$(EXT) $(COLLOCATED)$(EXT)
 
 OBJS		= ExceptionsI.obj
 
@@ -45,30 +53,36 @@ SRCS		= $(OBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-SAPDBFLAGS       = /pdb:$(SERVERAMD:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+SAPDBFLAGS       = /pdb:$(SERVERAMD).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS) $(OBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS) $(OBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS) $(OBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS) $(OBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVERAMD): $(SAMDOBJS) $(OBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVERAMD)$(EXT): $(SAMDOBJS) $(OBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS) $(OBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS) $(OBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(OBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 3a7b64d0c7f..4e70b5a51f3 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server");
+
 using namespace std;
 
 int
@@ -22,6 +25,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new ThrowerI();
     adapter->add(object, communicator->stringToIdentity("thrower"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 1d4c745adfd..767c7ac0c83 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestAMDI.h>
 
+DEFINE_TEST("serveramd");
+
 using namespace std;
 
 int
@@ -22,6 +25,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new ThrowerI();
     adapter->add(object, communicator->stringToIdentity("thrower"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/facets/Client.cpp b/cpp/test/Ice/facets/Client.cpp
index 25b5b2eb885..60ecbd0eeb1 100644
--- a/cpp/test/Ice/facets/Client.cpp
+++ b/cpp/test/Ice/facets/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp
index da189c8e5f2..e7cfd352c08 100644
--- a/cpp/test/Ice/facets/Collocated.cpp
+++ b/cpp/test/Ice/facets/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/facets/Makefile.mak b/cpp/test/Ice/facets/Makefile.mak
index 1cc31ab300a..182396baafb 100644
--- a/cpp/test/Ice/facets/Makefile.mak
+++ b/cpp/test/Ice/facets/Makefile.mak
@@ -9,11 +9,19 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_facets_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -36,24 +44,30 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index 4ef44bc4caa..e12f51ff762 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -24,7 +27,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter->addFacet(f, communicator->stringToIdentity("d"), "facetEF");
     Ice::ObjectPtr h = new HI(communicator);
     adapter->addFacet(h, communicator->stringToIdentity("d"), "facetGH");
-
+    TEST_READY
     adapter->activate();
     communicator->waitForShutdown();
 
diff --git a/cpp/test/Ice/hold/Client.cpp b/cpp/test/Ice/hold/Client.cpp
index 46b44b32b3d..f7b1c12df2d 100644
--- a/cpp/test/Ice/hold/Client.cpp
+++ b/cpp/test/Ice/hold/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/hold/Makefile.mak b/cpp/test/Ice/hold/Makefile.mak
index 14343d3dbc3..3c5d3a72db2 100644
--- a/cpp/test/Ice/hold/Makefile.mak
+++ b/cpp/test/Ice/hold/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_hold_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp
index 2b8641f0190..9de73fabed2 100644
--- a/cpp/test/Ice/hold/Server.cpp
+++ b/cpp/test/Ice/hold/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -36,6 +39,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter1->activate();
     adapter2->activate();
 
+    TEST_READY
+
     communicator->waitForShutdown();
 
     timer->destroy();
diff --git a/cpp/test/Ice/info/Client.cpp b/cpp/test/Ice/info/Client.cpp
index 936ddf29102..f8aa8a77a3a 100644
--- a/cpp/test/Ice/info/Client.cpp
+++ b/cpp/test/Ice/info/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/info/Makefile.mak b/cpp/test/Ice/info/Makefile.mak
index 17f16502602..e13d2019e6b 100644
--- a/cpp/test/Ice/info/Makefile.mak
+++ b/cpp/test/Ice/info/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_info_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  TestI.obj \
@@ -30,18 +38,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS) icessl$(LIBSUFFIX).lib
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp
index 0db8c76f43a..07e6d2c2a39 100644
--- a/cpp/test/Ice/info/Server.cpp
+++ b/cpp/test/Ice/info/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server");
+
 using namespace std;
 
 int
@@ -19,7 +22,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new TestI, communicator->stringToIdentity("test"));
     adapter->activate();
-
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index 878d93e3afb..065178b3289 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 63dd23a349a..ab71ae7d1b1 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 using namespace Test;
 
@@ -20,7 +23,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
-
+    
     InitialPrx allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
diff --git a/cpp/test/Ice/inheritance/Makefile.mak b/cpp/test/Ice/inheritance/Makefile.mak
index 1cc31ab300a..d8cc71a346e 100644
--- a/cpp/test/Ice/inheritance/Makefile.mak
+++ b/cpp/test/Ice/inheritance/Makefile.mak
@@ -9,11 +9,19 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_inheritance_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -36,24 +44,30 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index 5b9fc4b4244..a459a744e3e 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -20,6 +23,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new InitialI(adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/interceptor/Makefile.mak b/cpp/test/Ice/interceptor/Makefile.mak
index 603e6c43774..d8e86399124 100644
--- a/cpp/test/Ice/interceptor/Makefile.mak
+++ b/cpp/test/Ice/interceptor/Makefile.mak
@@ -33,7 +33,7 @@ CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
 !if "$(GENERATE_PDB)" == "yes"
 PDBFLAGS        = /pdb:$(DLLNAME:.dll=.pdb)
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
+CPDBFLAGS       = /pdb:$(CLIENT:.exe=.pdb)
 !endif
 
 SLICE2CPPFLAGS	= --dll-export INTERCEPTOR_TEST_API $(SLICE2CPPFLAGS)
diff --git a/cpp/test/Ice/invoke/Client.cpp b/cpp/test/Ice/invoke/Client.cpp
index 9d457da663f..c6e1d63da19 100644
--- a/cpp/test/Ice/invoke/Client.cpp
+++ b/cpp/test/Ice/invoke/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/invoke/Makefile.mak b/cpp/test/Ice/invoke/Makefile.mak
index 6a287a1bb94..10aa670e23d 100644
--- a/cpp/test/Ice/invoke/Makefile.mak
+++ b/cpp/test/Ice/invoke/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_invoke_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -30,18 +38,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 SLICE2CPPFLAGS  = --stream $(SLICE2CPPFLAGS)
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/invoke/Server.cpp b/cpp/test/Ice/invoke/Server.cpp
index 5a7af226c21..a82bf1256d2 100644
--- a/cpp/test/Ice/invoke/Server.cpp
+++ b/cpp/test/Ice/invoke/Server.cpp
@@ -8,9 +8,12 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <IceUtil/Options.h>
 #include <BlobjectI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 class ServantLocatorI : public Ice::ServantLocator
@@ -90,6 +93,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter->addServantLocator(new ServantLocatorI(array, async), "");
     adapter->activate();
 
+    TEST_READY
+
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp
index 93ea4db8096..b3a385c8207 100644
--- a/cpp/test/Ice/location/Client.cpp
+++ b/cpp/test/Ice/location/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/location/Makefile.mak b/cpp/test/Ice/location/Makefile.mak
index 4855962b667..e5c57b5c990 100644
--- a/cpp/test/Ice/location/Makefile.mak
+++ b/cpp/test/Ice/location/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_location_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -30,18 +38,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/location/Server.cpp b/cpp/test/Ice/location/Server.cpp
index 3f5bf0f29d2..61a8c38e680 100644
--- a/cpp/test/Ice/location/Server.cpp
+++ b/cpp/test/Ice/location/Server.cpp
@@ -9,8 +9,11 @@
 
 #include <Ice/Ice.h>
 #include <ServerLocator.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -45,6 +48,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
     adapter->add(locator, communicator->stringToIdentity("locator"));
 
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 8d217849c0b..0e8aef5be86 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index dc1c99de7f1..360b9dfc7e0 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/objects/Makefile.mak b/cpp/test/Ice/objects/Makefile.mak
index bb60d674704..a03336648fd 100644
--- a/cpp/test/Ice/objects/Makefile.mak
+++ b/cpp/test/Ice/objects/Makefile.mak
@@ -9,11 +9,19 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_objects_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  TestI.obj \
@@ -38,24 +46,30 @@ SRCS		= $(COBJS:.obj=.cpp) \
 SLICE2CPPFLAGS	= --stream $(SLICE2CPPFLAGS)
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index d3e1924c469..2935a81423a 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 using namespace Test;
 
@@ -57,6 +60,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     UnexpectedObjectExceptionTestIPtr uoet = new UnexpectedObjectExceptionTestI;
     adapter->add(uoet, communicator->stringToIdentity("uoet"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 8a633a4c41c..b8f7ebeb440 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -11,12 +11,12 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
-run(int argc, char* argv[], 
-    const Ice::CommunicatorPtr& communicator,
-    const Ice::InitializationData& initData)
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData)
 {
     Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
     Test::MyClassPrx myClass = allTests(communicator, false);
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index efa43b8e098..4657db9072a 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak
index eb930df88a8..a0f92b58206 100644
--- a/cpp/test/Ice/operations/Makefile.mak
+++ b/cpp/test/Ice/operations/Makefile.mak
@@ -9,12 +9,20 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-SERVERAMD	= serveramd.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_operations_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+SERVERAMD	= $(NAME_PREFIX)serveramd
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(SERVERAMD)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -59,30 +67,36 @@ CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 CPPFLAGS	= $(CPPFLAGS) -Zm200
 !endif
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-SAPDBFLAGS       = /pdb:$(SERVERAMD:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+SAPDBFLAGS       = /pdb:$(SERVERAMD).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVERAMD): $(SAMDOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVERAMD)$(EXT): $(SAMDOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index a26158c1d80..243c4ffa3b5 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -19,7 +22,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
-
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index 412f40a1e7f..768fec900c1 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestAMDI.h>
 
+DEFINE_TEST("serveramd")
+
 using namespace std;
 
 int
@@ -19,7 +22,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
-
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 305647be999..a451acb0887 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -731,6 +731,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
             test(r == ctx);
         }
 
+#ifndef ICE_OS_WINRT
         {
             //
             // Test implicit context propagation
@@ -795,7 +796,8 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 ic->destroy();
             }
         }
-    }
+#endif
+	}
 
     {
         Ice::Double d = 1278312346.0 / 13.0;
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 8b316887ad4..e1182970cfd 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1378,6 +1378,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
             cb->check();
         }
 
+#ifndef ICE_OS_WINRT
         {
             //
             // Test implicit context propagation
@@ -1447,6 +1448,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 ic->destroy();
             }
         }
+#endif
     }
 
     {
diff --git a/cpp/test/Ice/operations/TwowaysNewAMI.cpp b/cpp/test/Ice/operations/TwowaysNewAMI.cpp
index 9c4a2626f7b..0b156c55651 100644
--- a/cpp/test/Ice/operations/TwowaysNewAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysNewAMI.cpp
@@ -959,6 +959,7 @@ twowaysNewAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx&
             test(c == ctx);
         }
 
+#ifndef ICE_OS_WINRT
         {
             //
             // Test implicit context propagation
@@ -1028,6 +1029,7 @@ twowaysNewAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx&
                 ic->destroy();
             }
         }
+#endif
     }
 
     {
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 7b1165dc40a..4773088850d 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -856,7 +856,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
     if(communicator->getProperties()->getPropertyAsInt("Ice.IPv6") == 0)
     {
         // Working?
+#ifndef ICE_OS_WINRT
         bool ssl = communicator->getProperties()->getProperty("Ice.Default.Protocol") == "ssl";
+#else
+        bool ssl = true;
+#endif
         if(!ssl)
         {
             p1->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index 9d457da663f..1896366d79c 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -11,12 +11,12 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 int
-run(int argc, char* argv[], 
-    const Ice::CommunicatorPtr& communicator,
-    const Ice::InitializationData& initData)
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData)
 {
     Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
     Test::MyClassPrx myClass = allTests(communicator);
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index ac07f086ef0..fd559f8a3ad 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("collocated")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/proxy/Makefile.mak b/cpp/test/Ice/proxy/Makefile.mak
index b63f2827650..0f63e96dc8c 100644
--- a/cpp/test/Ice/proxy/Makefile.mak
+++ b/cpp/test/Ice/proxy/Makefile.mak
@@ -9,12 +9,20 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-SERVERAMD	= serveramd.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_proxy_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+SERVERAMD	= $(NAME_PREFIX)serveramd
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(SERVERAMD)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -42,30 +50,36 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-SAPDBFLAGS       = /pdb:$(SERVERAMD:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+SAPDBFLAGS       = /pdb:$(SERVERAMD).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVERAMD): $(SAMDOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVERAMD)$(EXT): $(SAMDOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp
index 0482116d7cc..ebd750ab3e7 100644
--- a/cpp/test/Ice/proxy/Server.cpp
+++ b/cpp/test/Ice/proxy/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -19,7 +22,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
     adapter->activate();
-
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index 3949bb98d8d..e76f015b27d 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestAMDI.h>
 
+DEFINE_TEST("serveramd")
+
 using namespace std;
 
 int
diff --git a/cpp/test/Ice/retry/Client.cpp b/cpp/test/Ice/retry/Client.cpp
index 430763ab8d4..f917158a746 100644
--- a/cpp/test/Ice/retry/Client.cpp
+++ b/cpp/test/Ice/retry/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/retry/Makefile.mak b/cpp/test/Ice/retry/Makefile.mak
index 14343d3dbc3..043b241c900 100644
--- a/cpp/test/Ice/retry/Makefile.mak
+++ b/cpp/test/Ice/retry/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_retry_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp
index 5cf27927c15..fda5cd33cdd 100644
--- a/cpp/test/Ice/retry/Server.cpp
+++ b/cpp/test/Ice/retry/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -20,6 +23,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new RetryI;
     adapter->add(object, communicator->stringToIdentity("retry"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/servantLocator/Makefile.mak b/cpp/test/Ice/servantLocator/Makefile.mak
index aafa1866c4f..edeb940de39 100644
--- a/cpp/test/Ice/servantLocator/Makefile.mak
+++ b/cpp/test/Ice/servantLocator/Makefile.mak
@@ -9,12 +9,20 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
-SERVERAMD	= serveramd.exe
-COLLOCATED	= collocated.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_servantLocator_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
+SERVERAMD	= $(NAME_PREFIX)serveramd
+COLLOCATED	= $(NAME_PREFIX)collocated
 
-TARGETS		= $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT) $(SERVERAMD)$(EXT) $(COLLOCATED)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -45,29 +53,36 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
-COPDBFLAGS       = /pdb:$(COLLOCATED:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
+SAPDBFLAGS       = /pdb:$(SERVERAMD).pdb
+COPDBFLAGS       = /pdb:$(COLLOCATED).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVERAMD): $(SAMDOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SAPDBFLAGS) $(SETARGV) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVERAMD)$(EXT): $(SAMDOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SAPDBFLAGS) $(SAMDOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(COLLOCATED): $(COLOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(COPDBFLAGS) $(SETARGV) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(COLLOCATED)$(EXT): $(COLOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(COPDBFLAGS) $(COLOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index ac6c9b08399..ca9b7663734 100755
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -20,6 +20,8 @@
 #   pragma warning( disable : 4996 )
 #endif
 
+DEFINE_TEST("client")
+
 using namespace std;
 
 class TestObjectWriter : public Ice::ObjectWriter
diff --git a/cpp/test/Ice/stream/Makefile.mak b/cpp/test/Ice/stream/Makefile.mak
index 267d3a78a55..7451dab5d83 100644
--- a/cpp/test/Ice/stream/Makefile.mak
+++ b/cpp/test/Ice/stream/Makefile.mak
@@ -9,9 +9,17 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_stream_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
 
-TARGETS		= $(CLIENT)
+TARGETS		= $(CLIENT)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj
@@ -23,12 +31,18 @@ SRCS		= $(COBJS:.obj=.cpp)
 SLICE2CPPFLAGS	= --stream $(SLICE2CPPFLAGS) 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/timeout/Client.cpp b/cpp/test/Ice/timeout/Client.cpp
index d02cbb01713..d7169a5d4ba 100644
--- a/cpp/test/Ice/timeout/Client.cpp
+++ b/cpp/test/Ice/timeout/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
diff --git a/cpp/test/Ice/timeout/Makefile.mak b/cpp/test/Ice/timeout/Makefile.mak
index 14343d3dbc3..c670eab259c 100644
--- a/cpp/test/Ice/timeout/Makefile.mak
+++ b/cpp/test/Ice/timeout/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_timeout_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp
index c86b6706d85..0e39eb56699 100644
--- a/cpp/test/Ice/timeout/Server.cpp
+++ b/cpp/test/Ice/timeout/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -20,6 +23,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     Ice::ObjectPtr object = new TimeoutI;
     adapter->add(object, communicator->stringToIdentity("timeout"));
     adapter->activate();
+    TEST_READY
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/udp/AllTests.cpp b/cpp/test/Ice/udp/AllTests.cpp
index 274f4246196..f61f213f103 100644
--- a/cpp/test/Ice/udp/AllTests.cpp
+++ b/cpp/test/Ice/udp/AllTests.cpp
@@ -135,8 +135,6 @@ allTests(const CommunicatorPtr& communicator)
 
     cout << "ok" << endl;
 
-
-    cout << "testing udp multicast... " << flush;
     string host;
     if(communicator->getProperties()->getProperty("Ice.IPv6") == "1")
     {
@@ -148,6 +146,8 @@ allTests(const CommunicatorPtr& communicator)
     }
     base = communicator->stringToProxy("test -d:udp -h " + host + " -p 12020");
     TestIntfPrx objMcast = TestIntfPrx::uncheckedCast(base);
+#ifndef ICE_OS_WINRT
+    cout << "testing udp multicast... " << flush;
 
     nRetry = 5;
     while(nRetry-- > 0)
@@ -170,6 +170,7 @@ allTests(const CommunicatorPtr& communicator)
     {
         cout << "ok" << endl;
     }
+#endif
 
     cout << "testing udp bi-dir connection... " << flush;    
     obj->ice_getConnection()->setAdapter(adapter);
diff --git a/cpp/test/Ice/udp/Client.cpp b/cpp/test/Ice/udp/Client.cpp
index a069286b8d4..194cb393d14 100644
--- a/cpp/test/Ice/udp/Client.cpp
+++ b/cpp/test/Ice/udp/Client.cpp
@@ -11,6 +11,8 @@
 #include <TestCommon.h>
 #include <Test.h>
 
+DEFINE_TEST("client")
+
 using namespace std;
 using namespace Test;
 
@@ -20,7 +22,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     void allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
-    int num = argc == 2 ? atoi(argv[1]) : 0;
+    int num = argc == 2 ? atoi(argv[1]) : 1;
     for(int i = 0; i < num; i++)
     {
         ostringstream os;
diff --git a/cpp/test/Ice/udp/Makefile.mak b/cpp/test/Ice/udp/Makefile.mak
index 14343d3dbc3..7ad6e8b4acc 100644
--- a/cpp/test/Ice/udp/Makefile.mak
+++ b/cpp/test/Ice/udp/Makefile.mak
@@ -9,10 +9,18 @@
 
 top_srcdir	= ..\..\..
 
-CLIENT		= client.exe
-SERVER		= server.exe
+!if "$(WINRT)" != "yes"
+NAME_PREFIX	= 
+EXT		= .exe
+!else
+NAME_PREFIX	= Ice_udp_
+EXT		= .dll
+!endif
+
+CLIENT		= $(NAME_PREFIX)client
+SERVER		= $(NAME_PREFIX)server
 
-TARGETS		= $(CLIENT) $(SERVER)
+TARGETS		= $(CLIENT)$(EXT) $(SERVER)$(EXT)
 
 COBJS		= Test.obj \
 		  Client.obj \
@@ -29,18 +37,24 @@ SRCS		= $(COBJS:.obj=.cpp) \
 
 CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
+!if "$(WINRT)" != "yes"
+LD_TESTFLAGS	= $(LD_EXEFLAGS) $(SETARGV)
+!else
+LD_TESTFLAGS	= $(LD_DLLFLAGS) /export:dllMain
+!endif
+
 !if "$(GENERATE_PDB)" == "yes"
-CPDBFLAGS        = /pdb:$(CLIENT:.exe=.pdb)
-SPDBFLAGS        = /pdb:$(SERVER:.exe=.pdb)
+CPDBFLAGS        = /pdb:$(CLIENT).pdb
+SPDBFLAGS        = /pdb:$(SERVER).pdb
 !endif
 
-$(CLIENT): $(COBJS)
-	$(LINK) $(LD_EXEFLAGS) $(CPDBFLAGS) $(SETARGV) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(CLIENT)$(EXT): $(COBJS)
+	$(LINK) $(LD_TESTFLAGS) $(CPDBFLAGS) $(COBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
-$(SERVER): $(SOBJS)
-	$(LINK) $(LD_EXEFLAGS) $(SPDBFLAGS) $(SETARGV) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
+$(SERVER)$(EXT): $(SOBJS)
+	$(LINK) $(LD_TESTFLAGS) $(SPDBFLAGS) $(SOBJS) $(PREOUT)$@ $(PRELIBS)$(LIBS)
 	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
 	    $(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
 
diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp
index 081b11b7998..e5ed3b505f7 100644
--- a/cpp/test/Ice/udp/Server.cpp
+++ b/cpp/test/Ice/udp/Server.cpp
@@ -8,8 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
+#include <TestCommon.h>
 #include <TestI.h>
 
+DEFINE_TEST("server")
+
 using namespace std;
 
 int
@@ -17,7 +20,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 {
     Ice::PropertiesPtr properties = communicator->getProperties();
 
-    int num = argc == 2 ? atoi(argv[1]) : -1;
+    int num = argc == 2 ? atoi(argv[1]) : 0;
 
     ostringstream os;
     os << "tcp -p " << (12010 + num);
@@ -48,6 +51,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     mcastAdapter->add(new TestIntfI, communicator->stringToIdentity("test"));
     mcastAdapter->activate();
 
+    TEST_READY
+
     communicator->waitForShutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/udp/TestI.cpp b/cpp/test/Ice/udp/TestI.cpp
index 95ff523cc2b..78d1a392c69 100644
--- a/cpp/test/Ice/udp/TestI.cpp
+++ b/cpp/test/Ice/udp/TestI.cpp
@@ -63,7 +63,7 @@ TestIntfI::pingBiDir(const Ice::Identity& id, const Ice::Current& current)
         //
         // Send the reply through the incoming connection.
         //
-        Test::PingReplyPrx::uncheckedCast(current.con->createProxy(id))->reply();
+        Test::PingReplyPrx::uncheckedCast(current.con->createProxy(id))->begin_reply();
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak
index b05e79c8599..8a7eac2d2f8 100644
--- a/cpp/test/Makefile.mak
+++ b/cpp/test/Makefile.mak
@@ -11,23 +11,22 @@ top_srcdir	= ..
 
 !include $(top_srcdir)/config/Make.rules.mak
 
+!if "$(WINRT)" == "yes"
+
+SUBDIRS		= Ice
+
+!else
+
 SUBDIRS		= IceUtil \
 		  Slice \
 		  Ice \
                   IceSSL
-
-!if "$(CPP_COMPILER)" != "VC60"
-SUBDIRS		= $(SUBDIRS) \
 		  Glacier2 \
 		  Freeze \
 		  IceStorm \
 		  FreezeScript \
 		  IceGrid
-
-!if "$(BCPLUSPLUS)" != "yes"
-SUBDIRS		= $(SUBDIRS) \
 		  IceBox
-!endif
 
 !endif
 
diff --git a/cpp/test/WinRT/.gitignore b/cpp/test/WinRT/.gitignore
new file mode 100644
index 00000000000..cd450510b65
--- /dev/null
+++ b/cpp/test/WinRT/.gitignore
@@ -0,0 +1,5 @@
+Debug/*
+Release/*
+TestSuite/Debug/*
+TestSuite/Release/*
+*.pch
+\ No newline at end of file
diff --git a/cpp/test/WinRT/TestSuite.sln b/cpp/test/WinRT/TestSuite.sln
new file mode 100644
index 00000000000..0b0ae6deff9
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite.sln
@@ -0,0 +1,38 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "TestSuite\TestSuite.vcxproj", "{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|ARM = Release|ARM
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Build.0 = Debug|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|ARM.Deploy.0 = Debug|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Build.0 = Debug|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|Win32.Deploy.0 = Debug|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.ActiveCfg = Debug|x64
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Build.0 = Debug|x64
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Debug|x64.Deploy.0 = Debug|x64
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.ActiveCfg = Release|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Build.0 = Release|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|ARM.Deploy.0 = Release|ARM
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.ActiveCfg = Release|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Build.0 = Release|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|Win32.Deploy.0 = Release|Win32
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.ActiveCfg = Release|x64
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Build.0 = Release|x64
+		{3CE71594-E3A4-4C38-9D0F-46E2A2076F6C}.Release|x64.Deploy.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/cpp/test/WinRT/TestSuite/App.xaml b/cpp/test/WinRT/TestSuite/App.xaml
new file mode 100644
index 00000000000..46472a7b4df
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/App.xaml
@@ -0,0 +1,45 @@
+<Application
+    x:Class="TestSuite.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TestSuite">
+
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+
+                <!-- 
+                    Styles that define common aspects of the platform look and feel
+                    Required by Visual Studio project and item templates
+                 -->
+                <ResourceDictionary Source="Common/StandardStyles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+            <Style x:Key="TitleStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+            </Style>
+            <Style x:Key="OutputStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="16" />
+            </Style>
+            <Style x:Key="H1Style" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="36" />
+                <Setter Property="Margin" Value="0,0,0,25" />
+            </Style>
+            <Style x:Key="FooterStyle" TargetType="TextBlock">
+                <Setter Property="Foreground" Value="White" />
+                <Setter Property="FontFamily" Value="Segoe UI Light" />
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="Margin" Value="0,8,0,0" />
+            </Style>
+            <Style x:Key="ButtonStyle" TargetType="Button">
+                <Setter Property="Foreground" Value="White"/>
+                <Setter Property="Background" Value="Gray"/>
+            </Style>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/cpp/test/WinRT/TestSuite/App.xaml.cpp b/cpp/test/WinRT/TestSuite/App.xaml.cpp
new file mode 100644
index 00000000000..45902d60d63
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/App.xaml.cpp
@@ -0,0 +1,83 @@
+//
+// App.xaml.cpp
+// Implementation of the App class.
+//
+
+#include "pch.h"
+#include "MainPage.xaml.h"
+
+using namespace TestSuite;
+
+using namespace Platform;
+using namespace Windows::ApplicationModel;
+using namespace Windows::ApplicationModel::Activation;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Interop;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
+
+/// <summary>
+/// Initializes the singleton application object.  This is the first line of authored code
+/// executed, and as such is the logical equivalent of main() or WinMain().
+/// </summary>
+App::App()
+{
+	InitializeComponent();
+	Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
+}
+
+/// <summary>
+/// Invoked when the application is launched normally by the end user.  Other entry points
+/// will be used when the application is launched to open a specific file, to display
+/// search results, and so forth.
+/// </summary>
+/// <param name="pArgs">Details about the launch request and process.</param>
+void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs)
+{
+	// Do not repeat app initialization when already running, just ensure that
+	// the window is active
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Running)
+	{
+		Window::Current->Activate();
+		return;
+	}
+
+	if (pArgs->PreviousExecutionState == ApplicationExecutionState::Terminated)
+	{
+		//TODO: Load state from previously suspended application
+	}
+
+	// Create a Frame to act navigation context and navigate to the first page
+	auto rootFrame = ref new Frame();
+	if (!rootFrame->Navigate(TypeName(MainPage::typeid)))
+	{
+		throw ref new FailureException("Failed to create initial page");
+	}
+
+	// Place the frame in the current Window and ensure that it is active
+	Window::Current->Content = rootFrame;
+	Window::Current->Activate();
+}
+
+/// <summary>
+/// Invoked when application execution is being suspended.  Application state is saved
+/// without knowing whether the application will be terminated or resumed with the contents
+/// of memory still intact.
+/// </summary>
+/// <param name="sender">The source of the suspend request.</param>
+/// <param name="e">Details about the suspend request.</param>
+void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
+{
+	(void) sender;	// Unused parameter
+	(void) e;	// Unused parameter
+
+	//TODO: Save application state and stop any background activity
+}
diff --git a/cpp/test/WinRT/TestSuite/App.xaml.h b/cpp/test/WinRT/TestSuite/App.xaml.h
new file mode 100644
index 00000000000..d7cd0e08434
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/App.xaml.h
@@ -0,0 +1,24 @@
+//
+// App.xaml.h
+// Declaration of the App class.
+//
+
+#pragma once
+
+#include "App.g.h"
+
+namespace TestSuite
+{
+	/// <summary>
+	/// Provides application-specific behavior to supplement the default Application class.
+	/// </summary>
+	ref class App sealed
+	{
+	public:
+		App();
+		virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ pArgs) override;
+
+	private:
+		void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
+	};
+}
diff --git a/cpp/test/WinRT/TestSuite/Assets/Logo.png b/cpp/test/WinRT/TestSuite/Assets/Logo.png
new file mode 100644
index 00000000000..e26771cb33a
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Assets/Logo.png
diff --git a/cpp/test/WinRT/TestSuite/Assets/SmallLogo.png b/cpp/test/WinRT/TestSuite/Assets/SmallLogo.png
new file mode 100644
index 00000000000..1eb0d9d528c
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Assets/SmallLogo.png
diff --git a/cpp/test/WinRT/TestSuite/Assets/SplashScreen.png b/cpp/test/WinRT/TestSuite/Assets/SplashScreen.png
new file mode 100644
index 00000000000..c951e031bdf
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Assets/SplashScreen.png
diff --git a/cpp/test/WinRT/TestSuite/Assets/StoreLogo.png b/cpp/test/WinRT/TestSuite/Assets/StoreLogo.png
new file mode 100644
index 00000000000..dcb672712c6
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Assets/StoreLogo.png
diff --git a/cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml b/cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml
new file mode 100644
index 00000000000..1937eb76021
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Common/StandardStyles.xaml
@@ -0,0 +1,1007 @@
+<!--
+    This file contains XAML styles that simplify application development.
+
+    These are not merely convenient, but are required by most Visual Studio project and item templates.
+    Removing, renaming, or otherwise modifying the content of these files may result in a project that
+    does not build, or that will not build once additional pages are added.  If variations on these
+    styles are desired it is recommended that you copy the content under a new name and modify your
+    private copy.
+-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Non-brush values that vary across themes -->
+    
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+            <x:String x:Key="BackButtonGlyph">&#xE071;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0BA;</x:String>
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+            <x:String x:Key="BackButtonGlyph">&#xE0A6;</x:String>
+            <x:String x:Key="BackButtonSnappedGlyph">&#xE0C4;</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <!-- RichTextBlock styles -->
+
+    <Style x:Key="BasicRichTextStyle" TargetType="RichTextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BasicRichTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ItemRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}"/>
+
+    <Style x:Key="BodyRichTextStyle" TargetType="RichTextBlock" BasedOn="{StaticResource BaselineRichTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <!-- TextBlock styles -->
+
+    <Style x:Key="BasicTextStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{StaticResource ApplicationForegroundThemeBrush}"/>
+        <Setter Property="FontSize" Value="{StaticResource ControlContentThemeFontSize}"/>
+        <Setter Property="FontFamily" Value="{StaticResource ContentControlThemeFontFamily}"/>
+        <Setter Property="TextTrimming" Value="WordEllipsis"/>
+        <Setter Property="TextWrapping" Value="Wrap"/>
+        <Setter Property="Typography.StylisticSet20" Value="True"/>
+        <Setter Property="Typography.DiscretionaryLigatures" Value="True"/>
+        <Setter Property="Typography.CaseSensitiveForms" Value="True"/>
+    </Style>
+
+    <Style x:Key="BaselineTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BasicTextStyle}">
+        <Setter Property="LineHeight" Value="20"/>
+        <Setter Property="LineStackingStrategy" Value="BlockLineHeight"/>
+        <!-- Properly align text along its baseline -->
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="4"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="HeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="40"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-2" Y="8"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="SubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="26.667"/>
+        <Setter Property="FontWeight" Value="Light"/>
+        <Setter Property="LineHeight" Value="30"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <TranslateTransform X="-1" Y="6"/>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TitleTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiBold"/>
+    </Style>
+
+    <Style x:Key="ItemTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}"/>
+
+    <Style x:Key="BodyTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontWeight" Value="SemiLight"/>
+    </Style>
+
+    <Style x:Key="CaptionTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BaselineTextStyle}">
+        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="Foreground" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+    </Style>
+
+    <!-- Button styles -->
+
+    <!--
+        TextButtonStyle is used to style a Button using subheader-styled text with no other adornment.  This
+        style is used in the GroupedItemsPage as a group header and in the FileOpenPickerPage for triggering
+        commands.
+    -->
+    <Style x:Key="TextButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        TextRadioButtonStyle is used to style a RadioButton using subheader-styled text with no other adornment.
+        This style is used in the SearchResultsPage to allow selection among filters.
+    -->
+    <Style x:Key="TextRadioButtonStyle" TargetType="RadioButton">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="MinHeight" Value="0"/>
+        <Setter Property="Margin" Value="0,0,30,0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RadioButton">
+                    <Grid Background="Transparent">
+                        <TextBlock
+                            x:Name="Text"
+                            Text="{TemplateBinding Content}"
+                            Margin="3,-7,3,10"
+                            TextWrapping="NoWrap"
+                            Style="{StaticResource SubheaderTextStyle}"/>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualWhite" Storyboard.TargetProperty="Opacity"/>
+                                        <DoubleAnimation Duration="0" To="1" Storyboard.TargetName="FocusVisualBlack" Storyboard.TargetProperty="Opacity"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused"/>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked"/>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ApplicationSecondaryForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate"/>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        AppBarButtonStyle is used to style a Button for use in an App Bar.  Content will be centered and should fit within
+        the 40-pixel radius glyph provided.  16-point Segoe UI Symbol is used for content text to simplify the use of glyphs
+        from that font.  AutomationProperties.Name is used for the text below the glyph.
+    -->
+    <Style x:Key="AppBarButtonStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+        <Setter Property="VerticalAlignment" Value="Stretch"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="20"/>
+        <Setter Property="AutomationProperties.ItemType" Value="App Bar Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="100" Background="Transparent">
+                        <StackPanel VerticalAlignment="Top" Margin="0,12,0,11">
+                            <Grid Width="40" Height="40" Margin="0,0,0,5" HorizontalAlignment="Center">
+                                <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0" Foreground="{StaticResource AppBarItemBackgroundThemeBrush}"/>
+                                <TextBlock x:Name="OutlineGlyph" Text="&#xE0A7;" FontFamily="Segoe UI Symbol" FontSize="53.333" Margin="-4,-19,0,0"/>
+                                <ContentPresenter x:Name="Content" HorizontalAlignment="Center" Margin="-1,-1,0,0" VerticalAlignment="Center"/>
+                            </Grid>
+                            <TextBlock
+                                x:Name="TextLabel"
+                                Text="{TemplateBinding AutomationProperties.Name}"
+                                Foreground="{StaticResource AppBarItemForegroundThemeBrush}"
+                                Margin="0,0,2,0"
+                                FontSize="12"
+                                TextAlignment="Center"
+                                Width="88"
+                                MaxHeight="32"
+                                TextTrimming="WordEllipsis"
+                                Style="{StaticResource BasicTextStyle}"/>
+                        </StackPanel>
+                        <Rectangle
+                                x:Name="FocusVisualWhite"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="1.5"/>
+                        <Rectangle
+                                x:Name="FocusVisualBlack"
+                                IsHitTestVisible="False"
+                                Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                                StrokeEndLineCap="Square"
+                                StrokeDashArray="1,1"
+                                Opacity="0"
+                                StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ApplicationViewStates">
+                                <VisualState x:Name="FullScreenLandscape"/>
+                                <VisualState x:Name="Filled"/>
+                                <VisualState x:Name="FullScreenPortrait">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Snapped">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Width">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="60"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal"/>
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemPressedForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="OutlineGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Content" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="TextLabel" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource AppBarItemDisabledForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualWhite"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                        <DoubleAnimation
+                                                Storyboard.TargetName="FocusVisualBlack"
+                                                Storyboard.TargetProperty="Opacity"
+                                                To="1"
+                                                Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Standard App Bar buttons -->
+  
+    <Style x:Key="SkipBackAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipBackAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Back"/>
+        <Setter Property="Content" Value="&#xE100;"/>
+    </Style>
+    <Style x:Key="SkipAheadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SkipAheadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Skip Ahead"/>
+        <Setter Property="Content" Value="&#xE101;"/>
+    </Style>
+    <Style x:Key="PlayAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PlayAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Play"/>
+        <Setter Property="Content" Value="&#xE102;"/>
+    </Style>
+    <Style x:Key="PauseAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PauseAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pause"/>
+        <Setter Property="Content" Value="&#xE103;"/>
+    </Style>
+    <Style x:Key="EditAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="EditAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Edit"/>
+        <Setter Property="Content" Value="&#xE104;"/>
+    </Style>
+    <Style x:Key="SaveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SaveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Save"/>
+        <Setter Property="Content" Value="&#xE105;"/>
+    </Style>
+    <Style x:Key="DeleteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DeleteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Delete"/>
+        <Setter Property="Content" Value="&#xE106;"/>
+    </Style>
+    <Style x:Key="DiscardAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DiscardAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Discard"/>
+        <Setter Property="Content" Value="&#xE107;"/>
+    </Style>
+    <Style x:Key="RemoveAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RemoveAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Remove"/>
+        <Setter Property="Content" Value="&#xE108;"/>
+    </Style>
+    <Style x:Key="AddAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="AddAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Add"/>
+        <Setter Property="Content" Value="&#xE109;"/>
+    </Style>
+    <Style x:Key="NoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="No"/>
+        <Setter Property="Content" Value="&#xE10A;"/>
+    </Style>
+    <Style x:Key="YesAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="YesAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Yes"/>
+        <Setter Property="Content" Value="&#xE10B;"/>
+    </Style>
+    <Style x:Key="MoreAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MoreAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="More"/>
+        <Setter Property="Content" Value="&#xE10C;"/>
+    </Style>
+    <Style x:Key="RedoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RedoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Redo"/>
+        <Setter Property="Content" Value="&#xE10D;"/>
+    </Style>
+    <Style x:Key="UndoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UndoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Undo"/>
+        <Setter Property="Content" Value="&#xE10E;"/>
+    </Style>
+    <Style x:Key="HomeAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HomeAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Home"/>
+        <Setter Property="Content" Value="&#xE10F;"/>
+    </Style>
+    <Style x:Key="OutAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="OutAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Out"/>
+        <Setter Property="Content" Value="&#xE110;"/>
+    </Style>
+    <Style x:Key="NextAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="NextAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Next"/>
+        <Setter Property="Content" Value="&#xE111;"/>
+    </Style>
+    <Style x:Key="PreviousAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PreviousAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Previous"/>
+        <Setter Property="Content" Value="&#xE112;"/>
+    </Style>
+    <Style x:Key="FavoriteAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="FavoriteAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Favorite"/>
+        <Setter Property="Content" Value="&#xE113;"/>
+    </Style>
+    <Style x:Key="PhotoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PhotoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Photo"/>
+        <Setter Property="Content" Value="&#xE114;"/>
+    </Style>
+    <Style x:Key="SettingsAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SettingsAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Settings"/>
+        <Setter Property="Content" Value="&#xE115;"/>
+    </Style>
+    <Style x:Key="VideoAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="VideoAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Video"/>
+        <Setter Property="Content" Value="&#xE116;"/>
+    </Style>
+    <Style x:Key="RefreshAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="RefreshAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Refresh"/>
+        <Setter Property="Content" Value="&#xE117;"/>
+    </Style>
+    <Style x:Key="DownloadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="DownloadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Download"/>
+        <Setter Property="Content" Value="&#xE118;"/>
+    </Style>
+    <Style x:Key="MailAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="MailAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Mail"/>
+        <Setter Property="Content" Value="&#xE119;"/>
+    </Style>
+    <Style x:Key="SearchAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="SearchAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Search"/>
+        <Setter Property="Content" Value="&#xE11A;"/>
+    </Style>
+    <Style x:Key="HelpAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="HelpAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Help"/>
+        <Setter Property="Content" Value="&#xE11B;"/>
+    </Style>
+    <Style x:Key="UploadAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UploadAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Upload"/>
+        <Setter Property="Content" Value="&#xE11C;"/>
+    </Style>
+    <Style x:Key="PinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="PinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Pin"/>
+        <Setter Property="Content" Value="&#xE141;"/>
+    </Style>
+    <Style x:Key="UnpinAppBarButtonStyle" TargetType="Button" BasedOn="{StaticResource AppBarButtonStyle}">
+        <Setter Property="AutomationProperties.AutomationId" Value="UnpinAppBarButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Unpin"/>
+        <Setter Property="Content" Value="&#xE196;"/>
+    </Style>
+
+    <!-- Title area styles -->
+
+    <Style x:Key="PageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource HeaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,30,40"/>
+    </Style>
+
+    <Style x:Key="PageSubheaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource SubheaderTextStyle}">
+        <Setter Property="TextWrapping" Value="NoWrap"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="Margin" Value="0,0,0,40"/>
+    </Style>
+
+    <Style x:Key="SnappedPageHeaderTextStyle" TargetType="TextBlock" BasedOn="{StaticResource PageSubheaderTextStyle}">
+        <Setter Property="Margin" Value="0,0,18,40"/>
+    </Style>
+
+    <!--
+        BackButtonStyle is used to style a Button for use in the title area of a page.  Margins appropriate for
+        the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="BackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Width" Value="48"/>
+        <Setter Property="Height" Value="48"/>
+        <Setter Property="Margin" Value="36,0,36,36"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="56"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid">
+                        <Grid Margin="-1,-16,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0A8;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0A6;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--
+        PortraitBackButtonStyle is used to style a Button for use in the title area of a portrait page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+    -->
+    <Style x:Key="PortraitBackButtonStyle" TargetType="Button" BasedOn="{StaticResource BackButtonStyle}">
+        <Setter Property="Margin" Value="26,0,26,36"/>
+    </Style>
+
+    <!--
+        SnappedBackButtonStyle is used to style a Button for use in the title area of a snapped page.  Margins appropriate
+        for the conventional page layout are included as part of the style.
+        
+        The obvious duplication here is necessary as the glyphs used in snapped are not merely smaller versions of the same
+        glyph but are actually distinct.
+    -->
+    <Style x:Key="SnappedBackButtonStyle" TargetType="Button">
+        <Setter Property="MinWidth" Value="0"/>
+        <Setter Property="Margin" Value="20,0,0,0"/>
+        <Setter Property="VerticalAlignment" Value="Bottom"/>
+        <Setter Property="FontFamily" Value="Segoe UI Symbol"/>
+        <Setter Property="FontWeight" Value="Normal"/>
+        <Setter Property="FontSize" Value="26.66667"/>
+        <Setter Property="AutomationProperties.AutomationId" Value="BackButton"/>
+        <Setter Property="AutomationProperties.Name" Value="Back"/>
+        <Setter Property="AutomationProperties.ItemType" Value="Navigation Button"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid x:Name="RootGrid" Width="36" Height="36" Margin="-3,0,7,33">
+                        <Grid Margin="-1,-1,0,0">
+                            <TextBlock x:Name="BackgroundGlyph" Text="&#xE0D4;" Foreground="{StaticResource BackButtonBackgroundThemeBrush}"/>
+                            <TextBlock x:Name="NormalGlyph" Text="{StaticResource BackButtonSnappedGlyph}" Foreground="{StaticResource BackButtonForegroundThemeBrush}"/>
+                            <TextBlock x:Name="ArrowGlyph" Text="&#xE0C4;" Foreground="{StaticResource BackButtonPressedForegroundThemeBrush}" Opacity="0"/>
+                        </Grid>
+                        <Rectangle
+                            x:Name="FocusVisualWhite"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualWhiteStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="1.5"/>
+                        <Rectangle
+                            x:Name="FocusVisualBlack"
+                            IsHitTestVisible="False"
+                            Stroke="{StaticResource FocusVisualBlackStrokeThemeBrush}"
+                            StrokeEndLineCap="Square"
+                            StrokeDashArray="1,1"
+                            Opacity="0"
+                            StrokeDashOffset="0.5"/>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverBackgroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="NormalGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonPointerOverForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BackgroundGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource BackButtonForegroundThemeBrush}"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="ArrowGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="NormalGlyph"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualWhite"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="FocusVisualBlack"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0"/>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- Item templates -->
+
+    <!-- Grid-appropriate 250 pixel square item template as seen in the GroupedItemsPage and ItemsPage -->
+    <DataTemplate x:Key="Standard250x250ItemTemplate">
+        <Grid HorizontalAlignment="Left" Width="250" Height="250">
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel VerticalAlignment="Bottom" Background="{StaticResource ListViewItemOverlayBackgroundThemeBrush}">
+                <TextBlock Text="{Binding Title}" Foreground="{StaticResource ListViewItemOverlayForegroundThemeBrush}" Style="{StaticResource TitleTextStyle}" Height="60" Margin="15,0,15,0"/>
+                <TextBlock Text="{Binding Subtitle}" Foreground="{StaticResource ListViewItemOverlaySecondaryForegroundThemeBrush}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap" Margin="15,0,15,10"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 500 by 130 pixel item template as seen in the GroupDetailPage -->
+    <DataTemplate x:Key="Standard500x130ItemTemplate">
+        <Grid Height="110" Width="480" Margin="10">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 130 pixel high item template as seen in the SplitPage -->
+    <DataTemplate x:Key="Standard130ItemTemplate">
+        <Grid Height="110" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="110" Height="110">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource TitleTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" MaxHeight="60"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!--
+        List-appropriate 80 pixel high item template as seen in the SplitPage when Filled, and
+        the following pages when snapped: GroupedItemsPage, GroupDetailPage, and ItemsPage
+    -->
+    <DataTemplate x:Key="Standard80ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Width="60" Height="60">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,0,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource ItemTextStyle}" MaxHeight="40"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource CaptionTextStyle}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- Grid-appropriate 300 by 70 pixel item template as seen in the SearchResultsPage -->
+    <DataTemplate x:Key="StandardSmallIcon300x70ItemTemplate">
+        <Grid Width="294" Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+    <!-- List-appropriate 70 pixel high item template as seen in the SearchResultsPage when Snapped -->
+    <DataTemplate x:Key="StandardSmallIcon70ItemTemplate">
+        <Grid Margin="6">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <Border Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="0,0,0,10" Width="40" Height="40">
+                <Image Source="{Binding Image}" Stretch="UniformToFill"/>
+            </Border>
+            <StackPanel Grid.Column="1" Margin="10,-10,0,0">
+                <TextBlock Text="{Binding Title}" Style="{StaticResource BodyTextStyle}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Subtitle}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+                <TextBlock Text="{Binding Description}" Style="{StaticResource BodyTextStyle}" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" TextWrapping="NoWrap"/>
+            </StackPanel>
+        </Grid>
+    </DataTemplate>
+
+  <!--
+      190x130 pixel item template for displaying file previews as seen in the FileOpenPickerPage
+      Includes an elaborate tooltip to display title and description text
+  -->
+  <DataTemplate x:Key="StandardFileWithTooltip190x130ItemTemplate">
+        <Grid>
+            <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}">
+                <Image
+                    Source="{Binding Image}"
+                    Width="190"
+                    Height="130"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Stretch="Uniform"/>
+            </Grid>
+            <ToolTipService.Placement>Mouse</ToolTipService.Placement>
+            <ToolTipService.ToolTip>
+                <ToolTip>
+                    <ToolTip.Style>
+                        <Style TargetType="ToolTip">
+                            <Setter Property="BorderBrush" Value="{StaticResource ToolTipBackgroundThemeBrush}" />
+                            <Setter Property="Padding" Value="0" />
+                        </Style>
+                    </ToolTip.Style>
+
+                    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+
+                        <Grid Background="{StaticResource ListViewItemPlaceholderBackgroundThemeBrush}" Margin="20">
+                            <Image
+                                Source="{Binding Image}"
+                                Width="160"
+                                Height="160"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Stretch="Uniform"/>
+                        </Grid>
+                        <StackPanel Width="200" Grid.Column="1" Margin="0,20,20,20">
+                            <TextBlock Text="{Binding Title}" TextWrapping="NoWrap" Style="{StaticResource BodyTextStyle}"/>
+                            <TextBlock Text="{Binding Description}" MaxHeight="140" Foreground="{StaticResource ApplicationSecondaryForegroundThemeBrush}" Style="{StaticResource BodyTextStyle}"/>
+                        </StackPanel>
+                    </Grid>   
+                </ToolTip>                
+            </ToolTipService.ToolTip>
+        </Grid>
+    </DataTemplate>
+
+    <!-- ScrollViewer styles -->
+
+    <Style x:Key="HorizontalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <Style x:Key="VerticalScrollViewerStyle" TargetType="ScrollViewer">
+        <Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Enabled" />
+        <Setter Property="ScrollViewer.ZoomMode" Value="Disabled" />
+    </Style>
+
+    <!-- Page layout roots typically use entrance animations and a theme-appropriate background color -->
+
+    <Style x:Key="LayoutRootStyle" TargetType="Panel">
+        <Setter Property="Background" Value="{StaticResource ApplicationPageBackgroundThemeBrush}"/>
+        <Setter Property="ChildrenTransitions">
+            <Setter.Value>
+                <TransitionCollection>
+                    <EntranceThemeTransition/>
+                </TransitionCollection>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml b/cpp/test/WinRT/TestSuite/MainPage.xaml
new file mode 100644
index 00000000000..7410acff541
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/MainPage.xaml
@@ -0,0 +1,77 @@
+<Page
+    x:Class="TestSuite.MainPage"
+    IsTabStop="false"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:TestSuite"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid Background="{StaticResource ApplicationPageBackgroundThemeBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+
+        <!-- Header -->
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="ZeroC - Ice Test Suite" Style="{StaticResource TitleStyle}"
+                       Margin="5, 5, 5, 5"
+                       VerticalAlignment="Bottom" TextWrapping="Wrap"/>
+        </StackPanel>
+
+        <!-- Content -->
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Grid.Row="0" Grid.Column="0" Orientation="Horizontal">
+                <ListBox x:Name="TestList" HorizontalAlignment="Left"
+                             Padding="5, 5, 15, 5">
+                </ListBox>
+            </StackPanel>
+            <Grid Grid.Row="0" Grid.Column="1">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="*"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Grid.Row="0" Grid.Column="0" 
+                           Style="{StaticResource H1Style}" 
+                           Text="Output" Margin="5, 5, 5, 5"/>
+                <Border Grid.Row="1" Grid.Column="0"  BorderThickness="2" BorderBrush="Gray" Background="Gray">
+                    <ScrollViewer x:Name="Scroller"  VerticalScrollBarVisibility="Auto" 
+                        HorizontalScrollBarVisibility="Disabled" 
+                        Width="Auto" Height="Auto"
+                        ZoomMode="Disabled">
+                        <TextBlock x:Name="Output" Style="{StaticResource OutputStyle}"   
+                                   Padding="5, 5, 5, 5" TextWrapping="Wrap"/>
+                    </ScrollViewer>
+                </Border>
+                <Border Grid.Row="2" Padding="5, 5, 5, 5">
+                    <StackPanel Orientation="Horizontal">                    
+                        <Button x:Name="btnRun" Content="Run" Click="btnRun_Click"/>
+                        <CheckBox x:Name="chkLoop" Content="Run In A Loop" Margin="10, 0, 0, 0"/>
+                        <CheckBox x:Name="chkSerialize" Content="Enable Serialize Mode" Margin="10, 0, 0, 0"/>
+                        <CheckBox x:Name="chkIPv6" Content="Use IPv6" Margin="10, 0, 0, 0"/>
+                        <CheckBox x:Name="chkSSL" Content="Enable SSL" Margin="10, 0, 0, 0"/>
+                    </StackPanel>
+                </Border>
+            </Grid>
+        </Grid>
+        <!-- Footer -->
+        <StackPanel Grid.Row="2" VerticalAlignment="Bottom">
+            <TextBlock Margin="5, 5, 5, 5"  Style="{StaticResource FooterStyle}" 
+                       Text="© 2012 ZeroC. All rights reserved."  TextWrapping="Wrap"/>
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
new file mode 100644
index 00000000000..a572f49a96f
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.cpp
@@ -0,0 +1,510 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include "MainPage.xaml.h"
+#include <IceUtil/StringUtil.h>
+#include <TestCommon.h>
+#include <string>
+#include <iostream>
+#include <Ice/Ice.h>
+using namespace std;
+using namespace TestSuite;
+
+using namespace Platform;
+using namespace Windows::Foundation;
+using namespace Windows::Foundation::Collections;
+using namespace Windows::UI::Core;
+using namespace Windows::UI::Xaml;
+using namespace Windows::UI::Xaml::Controls;
+using namespace Windows::UI::Xaml::Controls::Primitives;
+using namespace Windows::UI::Xaml::Data;
+using namespace Windows::UI::Xaml::Input;
+using namespace Windows::UI::Xaml::Media;
+using namespace Windows::UI::Xaml::Navigation;
+
+using namespace Platform::Collections;
+
+TextBlock^ output = nullptr;
+ScrollViewer^ scroller = nullptr;
+MainPage^ page = nullptr;
+
+namespace
+{
+
+void
+printToConsoleOutput(const std::string& message)
+{
+    assert(output != nullptr);
+    String^ msg = ref new String(IceUtil::stringToWstring(message).c_str());
+    output->Dispatcher->RunAsync(CoreDispatcherPriority::Normal,
+                                 ref new DispatchedHandler(
+                                     [msg] ()
+                                     {
+                                         output->Text += msg;
+                                         output->UpdateLayout();
+                                         scroller->ScrollToVerticalOffset(scroller->ScrollableHeight);
+                                     }, CallbackContext::Any));
+}
+
+void
+printLineToConsoleOutput(const std::string& msg)
+{
+    printToConsoleOutput(msg + '\n');
+}
+
+typedef int (*MAIN_ENTRY_POINT)(int, char**, Test::MainHelper*);
+
+typedef int (*SHUTDOWN_ENTRY_POINT)();
+
+enum TestConfigType { TestConfigTypeClient, TestConfigTypeServer, TestConfigTypeColloc };
+
+struct TestConfig
+{
+    TestConfigType type;
+    bool ssl;
+    bool serialize;
+    bool ipv6;
+};
+
+class Runnable : public IceUtil::Thread, public Test::MainHelper
+{
+public:
+
+    Runnable(const string& test, const TestConfig& config) :
+        _test(test),
+        _config(config),
+        _started(false),
+        _completed(false),
+        _status(0)
+    {
+    }
+
+    virtual ~Runnable()
+    {
+        if(_hnd != 0)
+        {
+            FreeLibrary(_hnd);
+        }
+    }
+    
+    virtual void 
+    run()
+    {
+        _hnd = LoadPackagedLibrary(IceUtil::stringToWstring(_test).c_str(), 0);
+        if(_hnd == 0)
+        {
+            printLineToConsoleOutput("failed to load `" + _test + "': " + IceUtilInternal::lastErrorToString());
+            completed(-1);
+            return;
+        }
+
+        _dllTestShutdown = GetProcAddress(_hnd, "dllTestShutdown");
+        if(_dllTestShutdown == 0)
+        {
+            printLineToConsoleOutput("failed to find dllTestShutdown function from `" + _test + "'");
+            completed(-1);
+            return;
+        }
+
+        FARPROC dllMain = GetProcAddress(_hnd, "dllMain");
+        if(dllMain == 0)
+        {
+            printLineToConsoleOutput("failed to find dllMain function from `" + _test + "'");
+            completed(-1);
+            return;
+        }
+
+        vector<string> args;
+        args.push_back("--Ice.Default.Host=127.0.0.1");
+        args.push_back("--Ice.NullHandleAbort=1");
+        args.push_back("--Ice.Warn.Connections=1");
+        //args.push_back("--Ice.Trace.Network=2");
+        //args.push_back("--Ice.Trace.Protocol=2");
+        args.push_back("--Ice.ProgramName=" + _test);
+        if(_config.serialize)
+        {
+            args.push_back("--Ice.ThreadPool.Server.Serialize=1");
+        }
+
+        if(_config.ipv6)
+        {
+            args.push_back("--Ice.Default.Host=0:0:0:0:0:0:0:1");
+            args.push_back("--Ice.IPv6=1");
+        }
+
+        if(_config.type != TestConfigTypeClient)
+        {
+            args.push_back("--Ice.ThreadPool.Server.Size=1");
+            args.push_back("--Ice.ThreadPool.Server.SizeMax=3");
+            args.push_back("--Ice.ThreadPool.Server.SizeWarn=0");
+        }
+
+        if(_config.ssl)
+        {
+            args.push_back("--Ice.Default.Protocol=ssl");
+        }
+
+        char** argv = new char*[args.size() + 1];
+        for(unsigned int i = 0; i < args.size(); ++i)
+        {
+            argv[i] = const_cast<char*>(args[i].c_str());
+        }
+        argv[args.size()] = 0;
+        int status = EXIT_FAILURE;
+        try
+        {
+            status = reinterpret_cast<MAIN_ENTRY_POINT>(dllMain)(static_cast<int>(args.size()), argv, this);
+        }
+        catch(const std::exception& ex)
+        {
+            print("unexpected exception while running `" + _test + "':\n" + ex.what());
+        }
+        catch(...)
+        {
+            print("unexpected unknown exception while running `" + _test + "'");
+        }
+
+        completed(status);
+        delete[] argv;
+    }
+    
+    void
+    waitForStart()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        while(!_started && !_completed)
+        {
+            _monitor.wait();
+        }
+        if(_completed && _status != 0)
+        {
+            ostringstream os;
+            os << "failed with status = " << _status;
+            throw os.str();
+        }
+    }
+    
+    virtual void 
+    waitForCompleted()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        while(!_completed)
+        {
+            _monitor.wait();
+        }
+        if(_status != 0)
+        {
+            ostringstream os;
+            os << "failed with status = " << _status;
+            throw os.str();
+        }
+    }
+
+    //
+    // MainHelper implementation
+    //
+
+    virtual void 
+    serverReady()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        _started = true;
+        _monitor.notify();
+    }
+
+    virtual void 
+    shutdown()
+    {
+        if(_dllTestShutdown)
+        {
+            reinterpret_cast<SHUTDOWN_ENTRY_POINT>(_dllTestShutdown)();
+        }
+    }
+    
+    virtual bool
+    redirect()
+    {
+        return _config.type == TestConfigTypeClient || _config.type == TestConfigTypeColloc;
+    }
+
+    virtual void
+    print(const string& message)
+    {
+        printToConsoleOutput(message);
+    }
+
+    int
+    status()
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        return _status;
+    }
+
+private:
+
+    void 
+    completed(int status)
+    {
+        IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+        _completed = true;
+        _status = status;
+        _monitor.notify();
+    }
+
+    IceUtil::Monitor<IceUtil::Mutex> _monitor;
+    string _test;
+    TestConfig _config;
+    bool _started;
+    bool _completed;
+    int _status;
+    Ice::CommunicatorPtr _communicator;
+    FARPROC _dllTestShutdown;
+    HINSTANCE _hnd;
+};
+typedef IceUtil::Handle<Runnable> RunnablePtr;
+
+struct TestCase
+{
+    string name;
+    string prefix;
+    const char* client;
+    const char* server;
+    const char* serverAMD;
+    const char* collocated;
+};
+
+}
+static const TestCase allTest[] =
+{
+    {"Ice\\adapterDeactivation", "Ice_adapterDeactivation_", "client.dll", "server.dll", 0, "collocated.dll" },
+    {"Ice\\ami", "Ice_ami_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\binding", "Ice_binding_", "client.dll", "server.dll", 0, 0 },
+//    {"Ice\\defaultValue", "Ice_defaultValue_", "client.dll", 0, 0, 0 },
+    {"Ice\\dispatcher", "Ice_dispatcher_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\exceptions", "Ice_exceptions_", "client.dll", "server.dll", "serveramd.dll", "collocated.dll" },
+    {"Ice\\facets", "Ice_facets_", "client.dll", "server.dll", 0, "collocated.dll" },
+    {"Ice\\hold", "Ice_hold_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\info", "Ice_info_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\inheritance", "Ice_inheritance_", "client.dll", "server.dll", 0, "collocated.dll" },
+    {"Ice\\invoke", "Ice_invoke_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\location", "Ice_location_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\objects", "Ice_objects_", "client.dll", "server.dll", 0, "collocated.dll" },
+    {"Ice\\operations", "Ice_operations_", "client.dll", "server.dll", "serveramd.dll", "collocated.dll" },
+    {"Ice\\proxy", "Ice_proxy_", "client.dll", "server.dll", "serveramd.dll", "collocated.dll" },
+    {"Ice\\retry", "Ice_retry_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\stream", "Ice_stream_", "client.dll", 0, 0, 0},
+    {"Ice\\timeout", "Ice_timeout_", "client.dll", "server.dll", 0, 0 },
+    {"Ice\\udp", "Ice_udp_", "client.dll", "server.dll", 0, 0 }
+};
+
+class TestRunner : public IceUtil::Thread
+{
+public:
+
+    TestRunner(const TestCase& test, const TestConfig& config) : _test(test), _config(config)
+    {
+    }
+
+    virtual void
+    run()
+    {
+        try
+        {
+            if(_test.server)
+            {
+                printLineToConsoleOutput("*** running test " + _test.name);
+                runClientServerTest(_test.server, _test.client);	
+                printLineToConsoleOutput("");
+            }
+            else
+            {
+                assert(_test.client);
+                printLineToConsoleOutput("**** running test " + _test.name);
+                runClientTest(_test.client, false);
+                printLineToConsoleOutput("");
+            }
+
+            if(_test.serverAMD)
+            {
+                printLineToConsoleOutput("*** running test with AMD server " + _test.name);
+                runClientServerTest(_test.server, _test.client);
+                printLineToConsoleOutput("");
+            }
+
+            if(_test.collocated)
+            {
+                printLineToConsoleOutput("*** running collocated test " + _test.name);
+                runClientTest(_test.collocated, true);
+                printLineToConsoleOutput("");
+            }
+
+            page->completed();
+        }
+        catch(Platform::Exception^ ex)
+        {
+            page->failed(ex->Message);
+        }
+        catch(const std::exception& ex)
+        {
+            page->failed(ref new String(IceUtil::stringToWstring(ex.what()).c_str()));
+        }
+        catch(const string& ex)
+        {
+            page->failed(ref new String(IceUtil::stringToWstring(ex).c_str()));
+        }
+        catch(...)
+        {
+            page->failed("unknown exception");
+        }
+    }
+    
+    void 
+    runClientServerTest(const string& server, const string& client)
+    {
+        RunnablePtr serverRunable;
+        if(!_config.ssl)
+        {
+            TestConfig svrConfig = _config;
+            svrConfig.type = TestConfigTypeServer;
+            serverRunable = new Runnable(_test.prefix + server, svrConfig);
+            serverRunable->start();
+            serverRunable->waitForStart();
+        }
+
+        TestConfig cltConfig = _config;
+        cltConfig.type = TestConfigTypeClient;
+        RunnablePtr clientRunable = new Runnable(_test.prefix + client, cltConfig);
+        clientRunable->start();
+
+        try
+        {
+            clientRunable->waitForCompleted();
+        }
+        catch(...)
+        {
+            if(serverRunable)
+            {
+                serverRunable->shutdown();
+                serverRunable->waitForCompleted();
+            }
+            throw;
+        }
+
+        if(serverRunable)
+        {
+            serverRunable->waitForCompleted();
+        }
+    }
+
+    void 
+    runClientTest(const string& client, bool collocated)
+    {
+        TestConfig cltConfig = _config;
+        cltConfig.type = collocated ? TestConfigTypeColloc : TestConfigTypeClient;
+        RunnablePtr clientRunable = new Runnable(_test.prefix + client, cltConfig);
+        clientRunable->start();
+        clientRunable->waitForCompleted();
+    }
+    
+private:
+
+    TestCase _test;
+    TestConfig _config;
+};
+
+typedef IceUtil::Handle<TestRunner> TestRunnerPtr;
+
+
+// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
+
+MainPage::MainPage()
+{
+    _names = ref new Vector<String^>();
+    for(int i = 0; i < sizeof(allTest)/sizeof(allTest[0]); ++i)
+    {
+        _names->Append(ref new String(IceUtil::stringToWstring(allTest[i].name).c_str()));
+    }
+    InitializeComponent();
+    page = this;
+    output = Output;
+    scroller = Scroller;
+    TestList->ItemsSource = _names;
+    TestList->SelectedIndex = 0;
+}
+
+/// <summary>
+/// Invoked when this page is about to be displayed in a Frame.
+/// </summary>
+/// <param name="e">Event data that describes how this page was reached.  The Parameter
+/// property is typically used to configure the page.</param>
+void 
+MainPage::OnNavigatedTo(NavigationEventArgs^ e)
+{
+    (void) e;	// Unused parameter
+}
+
+
+void
+MainPage::failed(String^ msg)
+{
+    printLineToConsoleOutput("Test failed");
+    printLineToConsoleOutput(IceUtil::wstringToString(msg->Data()));
+    completed();
+}
+
+void 
+MainPage::completed()
+{
+    page->Dispatcher->RunAsync(
+        CoreDispatcherPriority::Normal, 
+        ref new DispatchedHandler([=] ()
+                                  {
+                                      if(!chkLoop->IsChecked->Value)
+                                      {
+                                          TestList->IsEnabled = true;
+                                          btnRun->IsEnabled = true;
+                                          return;
+                                      }                                      
+                                      TestList->IsEnabled = true;
+                                      if(TestList->SelectedIndex == (sizeof(allTest)/sizeof(allTest[0])) -1)
+                                      {
+                                          TestList->SelectedIndex = 0;
+                                      }
+                                      else
+                                      {
+                                          TestList->SelectedIndex++;
+                                      }
+                                      TestList->IsEnabled = false;
+                                      runSelectedTest();
+                                  }));
+}
+
+void 
+MainPage::btnRun_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
+{
+    if(TestList->SelectedIndex >= 0 && TestList->SelectedIndex < sizeof(allTest)/sizeof(allTest[0]))
+    {
+        TestList->IsEnabled = false;
+        btnRun->IsEnabled = false;
+        output->Text = "";
+        runSelectedTest();
+    }
+}
+
+void 
+MainPage::runSelectedTest()
+{
+    TestConfig config;
+    config.ssl = chkSSL->IsChecked->Value;
+    config.serialize = chkSerialize->IsChecked->Value;
+    config.ipv6 = chkIPv6->IsChecked->Value;
+
+    TestRunnerPtr t = new TestRunner(allTest[TestList->SelectedIndex], config);
+    t->start();
+}
diff --git a/cpp/test/WinRT/TestSuite/MainPage.xaml.h b/cpp/test/WinRT/TestSuite/MainPage.xaml.h
new file mode 100644
index 00000000000..f9fbaf596a5
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/MainPage.xaml.h
@@ -0,0 +1,40 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
+
+#include "MainPage.g.h"
+#include <collection.h>
+
+namespace TestSuite
+{
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public ref class MainPage sealed
+{
+public:
+    
+    MainPage();
+    
+    void completed();
+    void failed(Platform::String^);
+
+protected:
+    
+    virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override;
+    
+private:
+
+    void btnRun_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
+    void runSelectedTest();
+    Platform::Collections::Vector<Platform::String^>^ _names;
+};
+
+}
diff --git a/cpp/test/WinRT/TestSuite/Package.appxmanifest b/cpp/test/WinRT/TestSuite/Package.appxmanifest
new file mode 100644
index 00000000000..caebae4707f
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/Package.appxmanifest
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
+  <Identity Name="9cf3ce93-b7f1-414e-b2bd-7181121c15ac" Publisher="CN=ZeroC" Version="1.0.0.0" />
+  <Properties>
+    <DisplayName>Ice Test Suite</DisplayName>
+    <PublisherDisplayName>ZeroC</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+  <Prerequisites>
+    <OSMinVersion>6.2.0</OSMinVersion>
+    <OSMaxVersionTested>6.2.0</OSMaxVersionTested>
+  </Prerequisites>
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="TestSuite.App">
+      <VisualElements DisplayName="Ice Test Suite" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="TestSuite" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
+    </Application>
+  </Applications>
+  <Capabilities>
+    <Capability Name="privateNetworkClientServer" />
+    <Capability Name="internetClientServer" />
+  </Capabilities>
+  <Extensions>
+    <Extension Category="windows.certificates">
+      <Certificates>
+        <Certificate StoreName="Root" Content="cacert.pem" />
+        <Certificate StoreName="CA" Content="cacert.pem" />
+        <TrustFlags ExclusiveTrust="true" />
+      </Certificates>
+    </Extension>
+  </Extensions>
+</Package>
+\ No newline at end of file
diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj
new file mode 100644
index 00000000000..3e6321b9bc0
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3ce71594-e3a4-4c38-9d0f-46e2a2076f6c}</ProjectGuid>
+    <RootNamespace>TestSuite</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
+    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(Registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Microsoft SDKs\Windows\v8.0\ExtensionSDKS\IceWinRT\3.4@)\DesignTime\CommonConfiguration\Neutral\IceWinRT.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <PackageCertificateKeyFile>key.pfx</PackageCertificateKeyFile>
+    <PackageCertificateThumbprint>22710365E93A16EA1983847965CFC340086BE8B1</PackageCertificateThumbprint>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalIncludeDirectories>.;..\..;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile />
+      <PrecompiledHeaderOutputFile />
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\TestCommon.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="MainPage.xaml.h">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Common\StandardStyles.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\ami\Ice_ami_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\ami\Ice_ami_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\binding\Ice_binding_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\binding\Ice_binding_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\dispatcher\Ice_dispatcher_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\dispatcher\Ice_dispatcher_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_serveramd.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\hold\Ice_hold_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\hold\Ice_hold_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\info/Ice_info_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\info\Ice_info_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\invoke\Ice_invoke_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\invoke\Ice_invoke_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\location\Ice_location_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\location\Ice_location_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_collocated.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_serveramd.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\retry\Ice_retry_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\retry\Ice_retry_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\stream\Ice_stream_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\timeout\Ice_timeout_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\timeout\Ice_timeout_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\udp\Ice_udp_client.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\Ice\udp\Ice_udp_server.dll">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="..\..\..\..\certs\cacert.pem">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Assets\Logo.png" />
+    <Image Include="Assets\SmallLogo.png" />
+    <Image Include="Assets\StoreLogo.png" />
+    <Image Include="Assets\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp">
+      <DependentUpon>App.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="MainPage.xaml.cpp">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <SDKReference Include="IceWinRT, Version=3.4" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties ZerocIce_Enabled="True" ZerocIce_Streaming="False" ZerocIce_ProjectVersion="1" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
+\ No newline at end of file
diff --git a/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters
new file mode 100644
index 00000000000..a265ba6d68e
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/TestSuite.vcxproj.filters
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Common">
+      <UniqueIdentifier>3ce71594-e3a4-4c38-9d0f-46e2a2076f6c</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Assets">
+      <UniqueIdentifier>aa39e686-931d-4eb4-a06f-1ce6c081fd4c</UniqueIdentifier>
+    </Filter>
+    <Page Include="Common\StandardStyles.xaml">
+      <Filter>Common</Filter>
+    </Page>
+    <Image Include="Assets\Logo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SmallLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\StoreLogo.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Image Include="Assets\SplashScreen.png">
+      <Filter>Assets</Filter>
+    </Image>
+    <Filter Include="Tests">
+      <UniqueIdentifier>{16bb0b82-e8f7-47c8-8ab9-25814f65a3c0}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="App.xaml.cpp" />
+    <ClCompile Include="MainPage.xaml.cpp" />
+    <ClCompile Include="pch.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="App.xaml.h" />
+    <ClInclude Include="MainPage.xaml.h" />
+    <ClInclude Include="..\..\include\TestCommon.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\adapterDeactivation\Ice_adapterDeactivation_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\ami\Ice_ami_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\ami\Ice_ami_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\binding\Ice_binding_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\binding\Ice_binding_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\dispatcher\Ice_dispatcher_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\dispatcher\Ice_dispatcher_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\exceptions\Ice_exceptions_serveramd.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\facets\Ice_facets_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\hold\Ice_hold_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\hold\Ice_hold_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\info/Ice_info_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\info\Ice_info_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\inheritance\Ice_inheritance_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\invoke\Ice_invoke_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\invoke\Ice_invoke_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\location\Ice_location_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\location\Ice_location_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\objects\Ice_objects_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\proxy\Ice_proxy_serveramd.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\timeout\Ice_timeout_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\timeout\Ice_timeout_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\udp\Ice_udp_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\udp\Ice_udp_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\..\..\certs\cacert.pem" />
+    <None Include="..\..\Ice\operations\Ice_operations_collocated.dll" />
+    <None Include="..\..\Ice\operations\Ice_operations_server.dll" />
+    <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll" />
+    <None Include="..\..\Ice\operations\Ice_operations_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_collocated.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_serveramd.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\retry\Ice_retry_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\retry\Ice_retry_server.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\stream\Ice_stream_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="..\..\Ice\operations\Ice_operations_client.dll">
+      <Filter>Tests</Filter>
+    </None>
+    <None Include="key.pfx" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="MainPage.xaml" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/test/WinRT/TestSuite/pch.cpp b/cpp/test/WinRT/TestSuite/pch.cpp
new file mode 100644
index 00000000000..f3963b9b14c
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/pch.cpp
@@ -0,0 +1,6 @@
+//
+// pch.cpp
+// Include the standard header and generate the precompiled header.
+//
+
+#include "pch.h"
diff --git a/cpp/test/WinRT/TestSuite/pch.h b/cpp/test/WinRT/TestSuite/pch.h
new file mode 100644
index 00000000000..77252482cf2
--- /dev/null
+++ b/cpp/test/WinRT/TestSuite/pch.h
@@ -0,0 +1,9 @@
+//
+// pch.h
+// Header for standard system include files.
+//
+
+#pragma once
+
+#include <collection.h>
+#include "App.xaml.h"
diff --git a/cpp/test/include/TestCommon.h b/cpp/test/include/TestCommon.h
index d68029b4ac9..02d2adba199 100644
--- a/cpp/test/include/TestCommon.h
+++ b/cpp/test/include/TestCommon.h
@@ -10,13 +10,33 @@
 #ifndef TEST_COMMON_H
 #define TEST_COMMON_H
 
-#include <IceUtil/Config.h>
+#include <IceUtil/IceUtil.h>
+#ifdef ICE_OS_WINRT
+#   include <Ice/Initialize.h>
+#   include <Ice/Logger.h>
+#   include <Ice/LocalException.h>
+#endif
+
 #include <cstdlib>
 
 #ifdef __BCPLUSPLUS__
 #include <stdlib.h>
 #endif
 
+void 
+inline print(const std::string& msg)
+{
+    std::cout << msg << std::flush;
+}
+
+void
+inline println(const std::string& msg)
+{
+    std::cout << msg << std::endl;
+}
+
+#ifndef ICE_OS_WINRT
+
 void
 inline testFailed(const char* expr, const char* file, unsigned int line)
 {
@@ -25,6 +45,202 @@ inline testFailed(const char* expr, const char* file, unsigned int line)
     abort();
 }
 
+#define DEFINE_TEST(name)
+#define TEST_READY
+
+#else
+
+namespace Test
+{
+
+class MainHelper : public std::streambuf
+{
+public:
+
+    MainHelper()
+    {
+        setp(&data[0], &data[sizeof(data) - 1]);
+    }
+
+    virtual void serverReady() = 0;
+
+    virtual void shutdown() = 0;
+
+    virtual void waitForCompleted() = 0;
+
+    virtual bool redirect() = 0;
+
+    virtual void print(const std::string& msg) = 0;
+
+    virtual void
+    flush()
+    {
+    }
+
+    virtual void
+    newLine()
+    {
+        print("\n");
+    }
+
+private:
+
+    //
+    // streambuf redirection implementation
+    //
+
+    int sync()
+    {
+        std::streamsize n = pptr() - pbase();
+        print(std::string(pbase(), static_cast<int>(n)));
+        pbump(-static_cast<int>(pptr() - pbase()));
+        return 0;
+    }
+
+    int overflow(int ch)
+    {
+        sync();
+        if(ch != EOF)
+        {
+            assert(pptr() != epptr());
+            sputc(ch);
+        }
+        return 0;
+    }
+
+    int sputc(char c)
+    {
+        if(c == '\n')
+        {
+            pubsync();
+        }
+        return std::streambuf::sputc(c);
+    }
+
+    char data[1024];
+};
+
+extern MainHelper* helper;
+
+class MainHelperInit
+{
+public:
+
+    MainHelperInit(MainHelper* r, const std::string& name, bool redirect)
+    {
+        helper = r;
+
+        if(redirect)
+        {
+            _previousLogger = Ice::getProcessLogger();
+            Ice::setProcessLogger(Ice::getProcessLogger()->cloneWithPrefix(name));
+            
+            _previousCoutBuffer = std::cout.rdbuf();
+            std::cout.rdbuf(r);
+            
+            _previousCerrBuffer = std::cerr.rdbuf();
+            std::cerr.rdbuf(r);
+        }
+    }
+
+    ~MainHelperInit()
+    {
+        if(_previousLogger)
+        {
+            Ice::setProcessLogger(_previousLogger);
+            std::cout.rdbuf(_previousCoutBuffer);
+            std::cerr.rdbuf(_previousCerrBuffer);
+        }
+    }
+
+private:
+
+    Ice::LoggerPtr _previousLogger;
+    std::streambuf* _previousCoutBuffer;
+    std::streambuf* _previousCerrBuffer;
+};
+
+//
+// Redefine main as Test::mainEntryPoint
+//
+#define main Test::mainEntryPoint
+int mainEntryPoint(int, char**);
+
+}
+
+class TestFailedException : public ::Ice::LocalException
+{
+public:
+
+    TestFailedException(const char* file, int line) : 
+        LocalException(file, line)
+    {
+    }
+
+    TestFailedException(const char* file, int line, const ::std::string& r) :
+        LocalException(file, line),
+        reason(r)
+    {
+    }
+
+    virtual ~TestFailedException() throw()
+    {
+    }
+
+    virtual ::std::string ice_name() const
+    {
+        return "::TestFailedException";
+    }
+
+    virtual ::Ice::Exception* ice_clone() const
+    {
+        return new TestFailedException(*this);
+    }
+
+    virtual void ice_throw() const
+    {
+        throw *this;
+    }
+
+    ::std::string reason;
+};
+
+void
+inline testFailed(const char* expr, const char* file, unsigned int line)
+{
+    std::cout << "failed!" << std::endl;
+    std::cout << file << ':' << line << ": assertion `" << expr << "' failed" << std::endl;
+    throw TestFailedException(__FILE__, __LINE__, "Test Failed");
+}
+
+#define DEFINE_TEST(name) \
+   Test::MainHelper* Test::helper; \
+   Ice::CommunicatorPtr communicatorInstance; \
+   extern "C" { \
+      _declspec(dllexport) void dllTestShutdown(); \
+      void dllTestShutdown() \
+      { \
+          try \
+          { \
+             communicatorInstance->destroy(); \
+          } \
+          catch(const Ice::LocalException&) \
+          { \
+          } \
+      } \
+      int dllMain(int argc, char** argv, Test::MainHelper* helper) \
+      { \
+          Test::MainHelperInit init(helper, name, helper->redirect());  \
+          return Test::mainEntryPoint(argc, argv); \
+      } \
+   }
+
+#define TEST_READY Test::helper->serverReady(); \
+    communicatorInstance = communicator;
+
+#endif
+
 #define test(ex) ((ex) ? ((void)0) : testFailed(#ex, __FILE__, __LINE__))
 
 #endif
+
diff --git a/cs/demo/Ice/hello/config.server b/cs/demo/Ice/hello/config.server
index 2af03144bb1..2ea33777760 100644
--- a/cs/demo/Ice/hello/config.server
+++ b/cs/demo/Ice/hello/config.server
@@ -44,3 +44,10 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.ImportCert.CurrentUser.Root=cacert.pem
 IceSSL.CertFile=s_rsa1024.pfx
 IceSSL.Password=password
+
+#
+# Verify the client certificate by default. Uncomment this property
+# setting if you run the demo with a client which doesn't support
+# client certificates (such as a Metro Style App client for example).
+#
+#IceSSL.VerifyPeer=0
+\ No newline at end of file
diff --git a/cs/src/Glacier2/SessionFactoryHelper.cs b/cs/src/Glacier2/SessionFactoryHelper.cs
index a53146f3844..d168b6eafcc 100644
--- a/cs/src/Glacier2/SessionFactoryHelper.cs
+++ b/cs/src/Glacier2/SessionFactoryHelper.cs
@@ -322,6 +322,10 @@ public class SessionFactoryHelper
                 sb.Append(_timeout);
             }
             initData.properties.setProperty("Ice.Default.Router", sb.ToString());
+            if(_secure)
+            {
+                initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory");
+            }
         }
         return initData;
     }
@@ -331,10 +335,6 @@ public class SessionFactoryHelper
     {
         _initData.properties.setProperty("Ice.ACM.Client", "0");
         _initData.properties.setProperty("Ice.RetryIntervals", "-1");
-        if(_secure)
-        {
-            _initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory");
-        }
     }
 
     private SessionCallback _callback;
diff --git a/java/demo/Ice/hello/config.server b/java/demo/Ice/hello/config.server
index 0fb1a4cbdf3..8c21cd8e11a 100644
--- a/java/demo/Ice/hello/config.server
+++ b/java/demo/Ice/hello/config.server
@@ -43,3 +43,10 @@ Ice.Plugin.IceSSL=IceSSL.PluginFactory
 IceSSL.DefaultDir=../../../../certs
 IceSSL.Keystore=server.jks
 IceSSL.Password=password
+
+#
+# Verify the client certificate by default. Uncomment this property
+# setting if you run the demo with a client which doesn't support
+# client certificates (such as a Metro Style App client for example).
+#
+#IceSSL.VerifyPeer=0
diff --git a/java/src/Glacier2/SessionFactoryHelper.java b/java/src/Glacier2/SessionFactoryHelper.java
index ed5241751a7..e7526510f80 100644
--- a/java/src/Glacier2/SessionFactoryHelper.java
+++ b/java/src/Glacier2/SessionFactoryHelper.java
@@ -91,10 +91,6 @@ public class SessionFactoryHelper
         //
         _initData.properties.setProperty("Ice.ACM.Client", "0");
         _initData.properties.setProperty("Ice.RetryIntervals", "-1");
-        if(_secure)
-        {
-            _initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
-        }
     }
 
     /**
@@ -316,6 +312,10 @@ public class SessionFactoryHelper
             }
 
             initData.properties.setProperty("Ice.Default.Router", sb.toString());
+            if(_secure)
+            {
+                initData.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL.PluginFactory");
+            }
         }
         return initData;
     }
diff --git a/py/demo/Ice/hello/config.server b/py/demo/Ice/hello/config.server
index 76e318b1915..183b5691acf 100644
--- a/py/demo/Ice/hello/config.server
+++ b/py/demo/Ice/hello/config.server
@@ -44,3 +44,10 @@ IceSSL.DefaultDir=../../../../certs
 IceSSL.CertAuthFile=cacert.pem
 IceSSL.CertFile=s_rsa1024_pub.pem
 IceSSL.KeyFile=s_rsa1024_priv.pem
+
+#
+# Verify the client certificate by default. Uncomment this property
+# setting if you run the demo with a client which doesn't support
+# client certificates (such as a Metro Style App client for example).
+#
+#IceSSL.VerifyPeer=0
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index 977d0d5d180..12ca1e94b38 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -36,6 +36,8 @@ sqlPassword = None
 serviceDir = None
 compact = False
 silverlight = False
+winrt = False
+serverOnly = False
 
 def isCygwin():
     # The substring on sys.platform is required because some cygwin
@@ -326,6 +328,8 @@ def run(tests, root = False):
           --service-dir=<dir>     Where to locate services for builds without service support.
           --compact               Ice for .NET uses the Compact Framework.
           --silverlight           Ice for .NET uses Silverlight.
+          --winrt                 Run server with configuration suite for Metro Style apps.
+          --server                Run only the server.
         """)
         sys.exit(2)
 
@@ -335,7 +339,7 @@ def run(tests, root = False):
                                     "debug", "protocol=", "compress", "valgrind", "host=", "serialize", "continue",
                                     "ipv6", "no-ipv6", "ice-home=", "cross=", "x64", "script", "env", "sql-type=",
                                     "sql-db=", "sql-host=", "sql-port=", "sql-user=", "sql-passwd=", "service-dir=",
-                                    "appverifier", "compact", "silverlight"])
+                                    "appverifier", "compact", "silverlight", "winrt", "server"])
     except getopt.GetoptError:
         usage()
 
@@ -351,6 +355,8 @@ def run(tests, root = False):
     noipv6 = False
     compact = "--compact" in opts
     silverlight = "--silverlight" in opts
+    winrt = "--winrt" in opts
+    serverOnly = "--server" in opts
 
     filters = []
     for o, a in opts:
@@ -397,7 +403,8 @@ def run(tests, root = False):
 
         if o in ( "--cross", "--protocol", "--host", "--debug", "--compress", "--valgrind", "--serialize", "--ipv6", \
                   "--ice-home", "--x64", "--env", "--sql-type", "--sql-db", "--sql-host", "--sql-port", "--sql-user", \
-                  "--sql-passwd", "--service-dir", "--appverifier", "--compact", "--silverlight"):
+                  "--sql-passwd", "--service-dir", "--appverifier", "--compact", "--silverlight", "--winrt", \
+                  "--server"):
             arg += " " + o
             if len(a) > 0:
                 arg += " " + a
@@ -703,7 +710,7 @@ class InvalidSelectorString(Exception):
 sslConfigTree = {
         "cpp" : {
             "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL --Ice.Default.Protocol=ssl " +
-            "--IceSSL.DefaultDir=%(certsdir)s --IceSSL.CertAuthFile=cacert.pem",
+            "--IceSSL.DefaultDir=%(certsdir)s --IceSSL.CertAuthFile=cacert.pem --IceSSL.VerifyPeer=%(verifyPeer)s",
             "client" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem",
             "server" : " --IceSSL.CertFile=s_rsa1024_pub.pem --IceSSL.KeyFile=s_rsa1024_priv.pem",
             "colloc" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem"
@@ -838,7 +845,7 @@ def getCommandLineProperties(exe, config):
     #
     # Turn on network tracing.
     #
-    # components.append("--Ice.Trace.Network=3")
+    #components.append("--Ice.Trace.Network=3")
 
     #
     # Now we add additional components dependent on the desired
@@ -847,6 +854,10 @@ def getCommandLineProperties(exe, config):
     if config.protocol == "ssl":
         sslenv = {}
         sslenv["certsdir"] = quoteArgument(os.path.abspath(os.path.join(toplevel, "certs")))
+        if winrt:
+            sslenv["verifyPeer"] = "0"
+        else:
+            sslenv["verifyPeer"] = "2"
         components.append(sslConfigTree[config.lang]["plugin"] % sslenv)
         components.append(sslConfigTree[config.lang][config.type] % sslenv)
 
@@ -1218,18 +1229,20 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
         server = getCommandLine(server, serverCfg, additionalServerOptions)
         serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang)
         print("ok")
+        
+        global serverOnly
+        if not serverOnly:
+            if clientLang == lang:
+                sys.stdout.write("starting %s... " % clientDesc)
+            else:
+                sys.stdout.write("starting %s %s ... " % (clientLang, clientDesc))
+            sys.stdout.flush()
+            client = getCommandLine(client, clientCfg, additionalClientOptions)
+            clientProc = spawnClient(client, env = clientenv, startReader = False, lang=clientCfg.lang)
+            print("ok")
+            clientProc.startReader()
+            clientProc.waitTestSuccess()
 
-        if clientLang == lang:
-            sys.stdout.write("starting %s... " % clientDesc)
-        else:
-            sys.stdout.write("starting %s %s ... " % (clientLang, clientDesc))
-        sys.stdout.flush()
-        client = getCommandLine(client, clientCfg, additionalClientOptions)
-        clientProc = spawnClient(client, env = clientenv, startReader = False, lang=clientCfg.lang)
-        print("ok")
-        clientProc.startReader()
-
-        clientProc.waitTestSuccess()
         serverProc.waitTestSuccess()
 
         if appverifier:
@@ -1455,6 +1468,8 @@ def processCmdLine():
           --service-dir=<dir>     Where to locate services for builds without service support.
           --compact               Ice for .NET uses the Compact Framework.
           --silverlight           Ice for .NET uses Silverlight.
+          --winrt                 Run server with configuration suite for Metro Style apps.
+          --server                Run only the server.
         """)
         sys.exit(2)
 
@@ -1462,7 +1477,8 @@ def processCmdLine():
         opts, args = getopt.getopt(
             sys.argv[1:], "", ["debug", "trace=", "protocol=", "compress", "valgrind", "host=", "serialize", "ipv6", \
                               "ice-home=", "x64", "cross=", "env", "sql-type=", "sql-db=", "sql-host=", "sql-port=", \
-                              "sql-user=", "sql-passwd=", "service-dir=", "appverifier", "compact", "silverlight"])
+                              "sql-user=", "sql-passwd=", "service-dir=", "appverifier", "compact", "silverlight", \
+                              "winrt", "server"])
     except getopt.GetoptError:
         usage()
 
@@ -1563,6 +1579,14 @@ def processCmdLine():
         elif o == "--silverlight":
             global silverlight
             silverlight = True
+        elif o == "--winrt":
+            global winrt
+            global serverOnly
+            winrt = True
+            serverOnly = True
+        elif o == "--server":
+            global serverOnly
+            serverOnly = True
 
     if len(args) > 0:
         usage()
diff --git a/vsaddin/INSTALL.txt b/vsaddin/INSTALL.txt
index 3b0e8228027..ca7139009bb 100644
--- a/vsaddin/INSTALL.txt
+++ b/vsaddin/INSTALL.txt
@@ -26,6 +26,9 @@ environments:
  - Windows 7 (x86 & x64) with Visual Studio 2008 SP1 or Visual Studio 
    2010
 
+ - Windows 8 (x86 & x64) with Visual Studio 2010 SP1 or Visual Studio 
+   2012
+
 Visual Studio Express is not supported.
 
 
@@ -39,6 +42,10 @@ Building the Ice Visual Studio Add-in requires:
 or
 
 - Microsoft Visual Studio 2010 and Visual Studio 2010 SDK
+
+or
+
+- Microsoft Visual Studio 2012 and Visual Studio 2012 SDK
   
 
 ======================================================================
@@ -63,8 +70,8 @@ subdirectory.
 The add-in DLL is placed into the Ice-@ver@\vsaddin\bin directory.
 The library name is
 
-   IceVisualStudioAddin-VS2008.dll or IceVisualStudioAddin-VS2010.dll
-
+   IceVisualStudioAddin-VS2008.dll, IceVisualStudioAddin-VS2010.dll or
+   IceVisualStudioAddin-VS2012.dll
 
 ======================================================================
 Installation
@@ -126,8 +133,9 @@ Configuration
 
    For C++, item templates are installed in:
   
-     C:\Program Files\Microsoft Visual Studio 9.0\VC\vcprojectitems or
-     C:\Program Files\Microsoft Visual Studio 10.0\VC\vcprojectitems
+     C:\Program Files\Microsoft Visual Studio 9.0\VC\vcprojectitems ,
+     C:\Program Files\Microsoft Visual Studio 10.0\VC\vcprojectitems or
+     C:\Program Files\Microsoft Visual Studio 11.0\VC\vcprojectitems
 
    Copy the Slice template and configuration files:
 
@@ -144,9 +152,10 @@ Configuration
    > copy Slize.zip "C:\Program Files\Microsoft Visual Studio 9.0\Common7\IDE\ItemTemplates\CSharp\1033"
    > devenv /installvstemplates
 
-   For Visual Studio 2010 C#, item templates are installed in:
+   For Visual Studio 2010 C# and Visual Studio 2012 C#, item templates are installed in:
      
-     C:\Program Files\Microsoft Visual Studio 10.0\VC#\CSharpProjectItems
+     C:\Program Files\Microsoft Visual Studio 10.0\VC#\CSharpProjectItems or
+     C:\Program Files\Microsoft Visual Studio 11.0\VC#\CSharpProjectItems
 
    Copy the Slice template and configuration files:
 
@@ -174,7 +183,7 @@ Configuration
 
    > copy C:\Ice-@ver@\vsaddin\config\ice.vsprops .
 
-   For VS 2010 the property sheet is ice.props
+   For VS 2010 and VS 2012 the property sheet is ice.props
 
    > copy C:\Ice-@ver@\vsaddin\config\ice.props .
 
diff --git a/vsaddin/addin-vs2012.sln b/vsaddin/addin-vs2012.sln
new file mode 100644
index 00000000000..168780d5540
--- /dev/null
+++ b/vsaddin/addin-vs2012.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "addin-vs2012", "src\addin-vs2012.csproj", "{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|x86.ActiveCfg = Debug|x86
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Debug|x86.Build.0 = Debug|x86
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|x86.ActiveCfg = Release|x86
+		{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/vsaddin/config/Ice-VS2012.AddIn b/vsaddin/config/Ice-VS2012.AddIn
new file mode 100644
index 00000000000..091c38c28ed
--- /dev/null
+++ b/vsaddin/config/Ice-VS2012.AddIn
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Extensibility xmlns="http://schemas.microsoft.com/AutomationExtensibility">
+    <HostApplication>
+        <Name>Microsoft Visual Studio</Name>
+        <Version>11.0</Version>
+    </HostApplication>
+    <Addin>
+        <FriendlyName>Ice-@ver@ Visual Studio Add-in</FriendlyName>
+        <Description>Ice-@ver@ Visual Studio Add-in for Visual Studio 2012</Description>
+        <AboutBoxDetails>The Ice Visual Studio Add-in integrates Ice projects into the Visual Studio IDE. 
+The add-in supports C++, .NET, and Silverlight projects. 
+To know more about Ice visit ZeroC website at http://www.zeroc.com</AboutBoxDetails>
+        <AboutIconData>0000010006002020100000000000E8020000660000001010100000000000280100004E0300002020000001000800A8080000760400001010000001000800680500001E0D00002020000001002000A8100000861200001010000001002000680400002E2300002800000020000000400000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF001111111111111111111111111111111111111111111111111111111000001111111111111111111111111110ABA01111111111111111111111111110BAB01111111111111111111111111110ABA01111111111110000000000F00000BAB00000111111118888888888F0ABABABABABA0111111118F77777777F0BABABABABAB0111111118F77777777F0ABABABABABA0111111118F77777777F00000BAB00000110001118F77777777FFFFF0ABA01111108880118F777777777777F0BAB01111887788008F777777777777F0ABA011118FF770778F777777777777F0000011118FFF78088F777777777777FFFFFF111118FF70118F7777777777777777801111118881118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118F7777777777777777801111111111118FFFFFFFFFFFFFFFFF801111111111118888888888888888888011111111111111111870111118701111111111111111111118F0111118F011111111111111111111108011111080111111111111111111110808011108080111111111111111111877788018777880111111111111111118FF778018FF7780111111111111111118FFF78018FFF7801111111111111111118FF701118FF7011111111111111111111777111117771111111111111111111111111111111111111111FFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFF000000FF000000FF000000FF000000FF000000C700000F8300000F0000000F0000000F0000000F8300000FC700000FFF00000FFF00000FFF00000FFF00000FFF00000FFFF8F8FFFFF8F8FFFFF8F8FFFFF0707FFFE0203FFFE0203FFFE0203FFFF0707FFFF8F8FFFFFFFFFF2800000010000000200000000100040000000000000000000000000000000000000000000000000000000000000000000080000000808000800000008000800080800000C0C0C000808080000000FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF0011111111111111111111111111100011111111111110A011111111111000B00011110000F0ABABA011118F88F000B00011118F77FFF0A01170718F7777F000110F008F7777FFFF1170718F777777801111118FFFFFFF801111118888888880111111111101111111111111170711111111111110F01111111111111707111111FFFF1111FFE37777FFE3ABABFF80ABA0F0001111F0007777F0030000100300000003011110037777F003FFF0F0031111FF7F8011FE3F7777FE3F77F0FE3F1111280000002000000040000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0C0CF50CF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0D3938350CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD303939380DFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD11395D390CFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD35353535356139393110310D30FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD39666162616161613939393811FDFDFDFDFDFDFDFDFDFD3231073231323132083D858A61666261616161393935FDFDFDFDFDFDFDFDFD5E080909820982838608398A8A8A856165626161613D35FDFDFDFDFDFDFDFD82B3AF08080808080808AB39393939398A86613935353535FDFDFDFDFDFDFDFD86D1F6AFAFAFAFAF08AF0808D408D4398A6586390886FDFDFD5A073632FDFDFD86B3F6F6F6AFF6AFAFAFAF08AB0808398A8A8A39D432FDFD8286D4825A35FDFD82FFF6AFF6F6AFF6AF08D1AF08AFD43D8A8A8A610831FDFD5EFFAF088232363286FFFFF6F6AFF6AFF6AFAF08AF08085D61613D5DD4F5FDFD82F6F6AF085A825E82FFFFFFFFF6D1F6AFF6AFF6AFAFAF080808D408D431FDFD86D4FFFF095EFDFD09FFFFFFFFFFF6B3F6F6AFAFD108AFAFAF08AB09860DFDFDFD08825E86FDFDFD82FFFFFFFFFFFFF6F6AFF6F6AFF6AF08D1AF08088232FDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFF6AFF6AFF6AFAF08AF088331FDFDFDFDFDFDFDFDFDFDFD86FFFFFFFFFFFFFFFFFFFFF6F6AFF6AFAFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFD86828682825EF75E5E5E5A5E5A5A07360736FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5E31FDFDFDFDFDFD5E31FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8232FDFDFDFDFDFD8232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5A360732FDFDFDFD5A360732FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD8286D4823607FDFD8286D4823607FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFAF088232FDFD5EFFAF088232FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF7D1FFAF0807FDFDF7D1FFAF0807FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0808FFFF095EFDFD0808FFFF095EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD0982F786FDFDFDFD0982F786FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FFC00000FF800000FF000000FF000003870000030300000300000003000000030300000387000003FF000003FF800007FFC0000FFFFCFCFFFFFCFCFFFFF8787FFFF0303FFFF0303FFFF0303FFFF0303FFFF8787FFFFFFFFFFFFFFFFF280000001000000020000000010008000000000000000000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000C0DCC000F0CAA600AA3F2A00FF3F2A00005F2A00555F2A00AA5F2A00FF5F2A00007F2A00557F2A00AA7F2A00FF7F2A00009F2A00559F2A00AA9F2A00FF9F2A0000BF2A0055BF2A00AABF2A00FFBF2A0000DF2A0055DF2A00AADF2A00FFDF2A0000FF2A0055FF2A00AAFF2A00FFFF2A000000550055005500AA005500FF005500001F5500551F5500AA1F5500FF1F5500003F5500553F5500AA3F5500FF3F5500005F5500555F5500AA5F5500FF5F5500007F5500557F5500AA7F5500FF7F5500009F5500559F5500AA9F5500FF9F550000BF550055BF5500AABF5500FFBF550000DF550055DF5500AADF5500FFDF550000FF550055FF5500AAFF5500FFFF550000007F0055007F00AA007F00FF007F00001F7F00551F7F00AA1F7F00FF1F7F00003F7F00553F7F00AA3F7F00FF3F7F00005F7F00555F7F00AA5F7F00FF5F7F00007F7F00557F7F00AA7F7F00FF7F7F00009F7F00559F7F00AA9F7F00FF9F7F0000BF7F0055BF7F00AABF7F00FFBF7F0000DF7F0055DF7F00AADF7F00FFDF7F0000FF7F0055FF7F00AAFF7F00FFFF7F000000AA005500AA00AA00AA00FF00AA00001FAA00551FAA00AA1FAA00FF1FAA00003FAA00553FAA00AA3FAA00FF3FAA00005FAA00555FAA00AA5FAA00FF5FAA00007FAA00557FAA00AA7FAA00FF7FAA00009FAA00559FAA00AA9FAA00FF9FAA0000BFAA0055BFAA00AABFAA00FFBFAA0000DFAA0055DFAA00AADFAA00FFDFAA0000FFAA0055FFAA00AAFFAA00FFFFAA000000D4005500D400AA00D400FF00D400001FD400551FD400AA1FD400FF1FD400003FD400553FD400AA3FD400FF3FD400005FD400555FD400AA5FD400FF5FD400007FD400557FD400AA7FD400FF7FD400009FD400559FD400AA9FD400FF9FD40000BFD40055BFD400AABFD400FFBFD40000DFD40055DFD400AADFD400FFDFD40000FFD40055FFD400AAFFD400FFFFD4005500FF00AA00FF00001FFF00551FFF00AA1FFF00FF1FFF00003FFF00553FFF00AA3FFF00FF3FFF00005FFF00555FFF00AA5FFF00FF5FFF00007FFF00557FFF00AA7FFF00FF7FFF00009FFF00559FFF00AA9FFF00FF9FFF0000BFFF0055BFFF00AABFFF00FFBFFF0000DFFF0055DFFF00AADFFF00FFDFFF0055FFFF00AAFFFF00FFCCCC00FFCCFF00FFFF3300FFFF6600FFFF9900FFFFCC00007F0000557F0000AA7F0000FF7F0000009F0000559F0000AA9F0000FF9F000000BF000055BF0000AABF0000FFBF000000DF000055DF0000AADF0000FFDF000055FF0000AAFF000000002A0055002A00AA002A00FF002A00001F2A00551F2A00AA1F2A00FF1F2A00003F2A00553F2A00F0FBFF00A4A0A000808080000000FF0000FF000000FFFF00FF00000000000000FFFF0000FFFFFF00FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFD353535FDFDFDFDFDFDFDFDFDFDFDFDFD356535FDFDFDFDFDFDFDFDFDFDFD39393985351111FDFDFDFDFDFDFDFDFD398A8A8A8A8935FDFDFDFDFDFD3131823D39398A393535FDFDFDFDFD32AF820808AB3DB239FDFDFDFDF5FDFD5AF6AFAFAF08393939FDFDFD5EFFF5F55EFFF6F6AFF6AF0886FDFDFDFD5EFDFD5EFFFFF6F6AFAFD4F5FDFDFDFDFDFDFDFDF75E5E5A5A0731FDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFDFDF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFFF5FDFDFDFDFDFDFDFDFDFDFDFDFDFD5EFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFDFFFFFDFDFFC7FDFDFFC7FDFDFF01FDFDFF01FD39F8016261F0076139B00738110007FDFDB007FDFDF80F3231FF7F3132FF7F083DFE3F6166FF7F6161FFFF39352800000020000000400000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002E5B35FC295231FF274F2FFF264D2EFF27502FFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000306138FE329A4FFF2C9649FF259244FF2A5432FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000356A3DFC3FA259FF389D54FF319A4EFF2E5D36FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000397341FE4DAB66FF45A65FFF3DA158FF316439FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045874CFF43854BFF42824AFF407E47FF3F7C46FF5BB471FF53AF6AFF4BAA64FF356B3DFF34683CFF33673BFF326439FF306038FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000519F58FF85CF94FF7FCA8FFF77C689FF70C183FF69BD7DFF61B876FF59B370FF51AE6AFF49A963FF42A55CFF3B9F56FF387040FF00000000000000000000000000000000000000000000000000000000000000000000000089715F4689715FFF866E5BFF846B59FF816855FF7E6552FF7B624FFF79604CFF846E5CFFCAC1B9FF55A85DFF8FD59CFF8AD198FF84CD93FF7DCA8EFF76C688FF6EC082FF67BB7CFF5FB775FF58B26EFF50AD67FF48A861FF3E7A46FF000000000000000000000000000000000000000000000000000000000000000089715F46AE998AFFD2C0B6FFD0BDB3FFCEBBB1FFCCB9AEFFCBB6ABFFCAB4A9FFC7B2A6FFCCB8ADFFD4C4BCFF5AB061FF97DAA3FF93D8A0FF8ED49CFF88D097FF83CC92FF7BC98CFF75C487FF6DC081FF65BB7AFF5EB673FF56B16DFF43854AFF0000000000000000000000000000000000000000000000000000000000000000C3AFA2FFF3EFECFFE6DEDAFFE0D4CEFFDFD2CAFFDDCEC7FFDACCC3FFD8C9C1FFD6C6BDFFD8C8C1FFE1D6CFFF59AB60FF58AA5EFF56A75DFF55A65DFF57AA5EFF8DD39BFF87CF97FF81CC91FF4F9B57FF4B9352FF498D50FF478C4FFC46894DFC0000000000000000000000000000000000000000000000000000000000000000C4B0A3FFF7F3F1FFF5F0EEFFF2EDEBFFEFEAE7FFEEE6E3FFEBE3DFFFE8DFDBFFE6DCD6FFE4D8D2FFE1D4CEFFDED0CAFFDCCDC6FFD9C9C2FFD6C6BDFF57AB5EFF95D9A2FF91D69EFF8CD29AFF519E58FFDED2CBFFC4BAB2FF0000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000C5B1A4FFF9F7F5FFF7F4F3FFF5F2EFFFF3EEECFFF0EBE8FFEFE8E4FFEDE4E1FFEAE1DDFFE7DDD8FFE4DAD4FFE2D7D0FFDFD3CCFFDCCEC8FFDACBC3FF5AAE62FF99DBA5FF99DAA4FF94D8A2FF54A45BFFDFD4CEFF846E5EFF0000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000C5B2A4FFFBFAF9FFF9F8F6FFF8F5F3FFF6F3F0FFF4EFEEFFF2ECEAFFF0EAE6FFEEE6E2FFEBE3DEFFE8DFDAFFE5DBD6FFE3D8D2FFE0D4CDFFDDD0C9FF5DB564FF99DBA5FF99DBA5FF99DBA5FF69B570FFDDD1CAFF69503BFF0000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8866E5BFF846B59FFC6B2A5FFFDFDFDFFFCFAFAFFFBF9F8FFF9F6F5FFF7F3F2FFF5F0EEFFF2EEECFFF0EBE8FFEEE7E4FFECE4E0FFE9E1DCFFE6DDD7FFE4D9D4FFE2D6D0FF5DB263FF62BF69FF62BF69FF61BE68FF6AB671FFDED2CBFF6C523EFF0000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8C7B1A6FFB39A8AFFC6B3A5FFFFFFFFFFFFFDFEFFFDFBFBFFFBFAF9FFF9F8F6FFF7F5F3FFF5F2F0FFF3EFEDFFF1ECE9FFEFE9E5FFEDE6E2FFEBE3DEFFE8DFDAFFE6DBD5FFE2D8D2FFE0D4CDFFDDCFC9FFDFD1CBFFDED2CBFFDDCFC7FF6F5541FF0000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000C7B3A6FFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFDFFFCFBFAFFFAF9F8FFF8F6F5FFF7F3F2FFF5F0EFFFF2EDEAFFF0EAE7FFEEE7E3FFEBE4DFFFE9E0DCFFE6DDD7FFE4D9D3FFE1D5CFFFDFD1CBFFD0BDB4FFC5B0A4FF725945FF0000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000C7B5A7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFEFDFFFCFCFBFFFBFAF8FFFAF7F6FFF7F5F2FFF6F2EFFFF3EFEDFFF2ECE9FFEFE9E5FFECE5E1FFEAE2DDFFE7DED9FFE5DBD5FFE2D7D1FFD3C2BAFFC8B3A8FF755C49FF00000000000000000000000000000000000000000000000000000000000000000000000000000000C8B5A8CAFFFFFFDAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFDFCFCFFFCFBFAFFFAF8F8FFF8F6F4FFF6F3F1FFF5F0EEFFF2EDEAFFF0EAE6FFEDE6E3FFEBE4DFFFE9E0DBFFE6DCD7FFDCCFC8FFCBB7ABFF795F4CFF0000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2FFFFFFCDFFFFFFEAFFFFFFF4FFFFFFFFFFFFFFFFFFFFFFFFFEFDFDFFFDFCFBFFFBFAF9FFFAF6F5FFF7F4F3FFF5F2EFFFF3EEECFFF1EBE8FFEFE8E5FFECE5E1FFEAE1DDFFE4DAD5FF866E5CFF866E5C46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000089715F31C5B1A4B2C3AFA2D3C0AD9EE8BDA99CFFBBA698FFB7A495FFB5A091FFB19C8DFFAE9989FFAB9585FFA79281FFA48E7DFFA08A7AFF9C8675FF988271FF957E6DFF917A68FF8A7260FF866E5C460000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B39A8AFF846B59FF000000000000000000000000000000000000000000000000B39A8AFF846B59FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF000000000000000000000000000000000000000000000000C7B1A6FF866E5BFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C0826855310000000000000000BEAFA531A69183C08D7664F8856C5AF8866B59C082685531000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC00000000000000000BCADA2C0C7BAB0FFD7C7C1FFC3ADA1FF9D8373FF876D5AC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF80000000000000000B19E90F8F9F7F6FFF0EAE8FFDCCEC6FFC2AEA1FF88705DF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF80000000000000000B8A699F8F9F8F7FFFFFFFFFFF0EBE8FFD6C9C0FF937B6AF8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C00000000000000000CDC0B6C0DBD2CBFFFAF8F7FFF9F8F7FFCABDB4FFAB9789C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB310000000000000000DCD1CA31CFC1B7C0BBA99CF8B6A396F8C2B3A8C0C4B5AB3100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFE0FFFFFFE0FFFFFFE0FFFFFE000FFFFE000FF800000FF000000FF000000FF000003030000030300000300000003000000030300000303000003FF000003FF000003FF800007FFFCFCFFFFFCFCFFFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFF0303FFFFFFFFFFFFFFFFF2800000010000000200000000100200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF4643854BFF407D47FF3B7643FFFFFFFF46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000488E50FF7BC88DFF3F7D47FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055A65CFF519E58FF4D9554FF8AD29AFF43854BFF407E47FF3C7643FF00000000000000000000000000000000000000000000000000000000000000000000000059AE60FFA4E3B2FF9FE0ADFF9ADCA8FF94D9A3FF8ED59FFF407E47FF000000000000000000000000000000000000000000000000755B46FF6E5541FFC0B5ACFF5CB463FF59AE60FF55A65CFFAAE7B7FF4C9653FF478D4FFF44854BFF00000000000000000000000000000000FFFFFF31856D5AFFEDE6E3FFBFA79AFFD5C6BDFFD7C8C0FFD3C5BCFF59AE60FFB9F0C3FF509E58FF0000000000000000000000006348333B634833FF6348333BFFFFFF6A97806FFFF6F2F1FFF2EDEAFFEDE6E3FFE8E0DCFFE4D9D3FF5DB464FF59AE60FF55A75CFF000000000000000000000000AE9A8BFFFFFFFFFF634833FF634833FFA99484FFFDFBFCFFF9F7F7FFF6F3F0FFF2EDEAFFEDE7E3FFEBE3E0FFD9CEC7FFC4BAB2FF0000000000000000000000006348333BAE9A8BFF6348333BFFFFFF79B29D8EFFFFFFFFFFFCFCFBFFFAF8F7FFF6F2F1FFF2EDEAFFE9E0DBFFDFD2CBFF694E3AFF000000000000000000000000000000000000000000000000FFFFFF4600000000B6A193FFAE9A8BFFA79181FF9F8979FF97806FFF876F5DFF785F4CFF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000634833FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333F634833FF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000AE9A8BFFFFFFFFFF634833FF000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006348333FAE9A8BFF6348333F00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFF0000FF830000FFC70000FF010000FF010000F8010000E0070000000700000007000000070000E80F0000FF7F0000FE3F0000FE3F0000FE3F0000FFFF0000</AboutIconData>
+        <Assembly>@installdir@\vsaddin\IceVisualStudioAddin-VS2012.dll</Assembly>
+        <FullClassName>Ice.VisualStudio.Connect</FullClassName>
+        <LoadBehavior>1</LoadBehavior>
+        <CommandPreload>1</CommandPreload>
+        <CommandLineSafe>1</CommandLineSafe>
+    </Addin>
+</Extensibility>
diff --git a/vsaddin/config/Make.rules.mak b/vsaddin/config/Make.rules.mak
index 8f9a0bee687..a3ab6546347 100644
--- a/vsaddin/config/Make.rules.mak
+++ b/vsaddin/config/Make.rules.mak
@@ -28,7 +28,7 @@ DEBUG			= yes
 OPTIMIZE		= yes
 
 #
-# Define VS to VS2010 or VS2008 to build with that Visual Studio Version.
+# Define VS to VS2012, VS2010 or VS2008 to build with that Visual Studio Version.
 # 
 #
 #VS             = VS2008
@@ -50,13 +50,23 @@ KEYFILE			= $(top_srcdir)\config\IceDevKey.snk
 # Common definitions
 #
 
+ice_language     = cs
+!if exist ($(top_srcdir)\..\config\Make.common.rules.mak)
+!include $(top_srcdir)\..\config\Make.common.rules.mak
+!else
+!include $(top_srcdir)\config\Make.common.rules.mak
+!endif
+
 EVERYTHING      = all install clean
 
 #
 # Visual Studio version
 #
 
-!if "$(VS)" == "" && "$(VSSDK100INSTALL)" != ""
+!if "$(VS)" == "" && "$(VSSDK110INSTALL)" != ""
+VS = VS2012
+!message VS2012 will be used!
+!elseif "$(VS)" == "" && "$(VSSDK100INSTALL)" != ""
 VS = VS2010
 !message VS2010 will be used!
 !elseif "$(VS)" == "" && "$(VSSDK90INSTALL)" != ""
@@ -64,14 +74,16 @@ VS = VS2008
 !message VS was not set VS2008 will be used!
 !endif
 
-!if "$(VS)" == "VS2010" 
+!if "$(VS)" == "VS2012" 
+VSSDK_HOME              = $(VSSDK110INSTALL)
+!elseif "$(VS)" == "VS2010" 
 VSSDK_HOME              = $(VSSDK100INSTALL)
 !elseif "$(VS)" == "VS2008"
 VSSDK_HOME		= $(VSSDK90INSTALL)
 !endif
 
 !if "$(VSSDK_HOME)" == ""
-!error Neither VSSDK100INSTALL not VSSDK90INSTALL is set, seems that Visual Studio SDK isn't properly installed
+!error Neither VSSDK110INSTALL, VSSDK100INSTALL not VSSDK90INSTALL is set, seems that Visual Studio SDK isn't properly installed
 !endif
 
 VSTARGET                = $(VS)
@@ -80,9 +92,7 @@ PKG_PREFIX 		= $(VSTARGET)
 
 !if "$(VS)" == "VS2008"
 PROPERTY_SHEET = "ice.vsprops"
-!endif
-
-!if "$(VS)" == "VS2010"
+!else
 PROPERTY_SHEET = "ice.props"
 !endif
 
@@ -110,15 +120,9 @@ MCSFLAGS 		= $(MCSFLAGS) -debug -define:DEBUG
 MCSFLAGS 		= $(MCSFLAGS) -optimize+
 !endif
 
-!if "$(VSTARGET)" == "VS2008"
-MCSFLAGS = $(MCSFLAGS) -define:VS2008
-!endif
-
-!if "$(VSTARGET)" == "VS2010"
-MCSFLAGS = $(MCSFLAGS) -define:VS2010
-!endif
-
+MCSFLAGS = $(MCSFLAGS) -define:$(VSTARGET)
 
+!if "$(VSTARGET)" == "VS2008" || "$(VSTARGET)" == "VS2010"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE.dll"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\EnvDTE80.dll"
 
@@ -127,6 +131,17 @@ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSINSTALLDIR)\Common7\IDE\PublicAssemblies\
 
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll"
+!elseif "$(VSTARGET)" == "VS2012"
+
+MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\EnvDTE.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\EnvDTE80.dll"
+
+MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\Microsoft.VisualStudio.CommandBars.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\VSLangProj.dll"
+
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll"
+!endif
 
 !if "$(VSTARGET)" == "VS2008"
 
@@ -138,9 +153,7 @@ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.dll"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\Microsoft.VisualStudio.Shell.Interop.8.0.dll"
 
-!endif
-
-!if "$(VSTARGET)" == "VS2010"
+!elseif "$(VSTARGET)" == "VS2010"
 
 MCSFLAGS = $(MCSFLAGS) /reference:"Microsoft.Build.dll"
 
@@ -150,7 +163,13 @@ MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.dll"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll"
 MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.8.0.dll"
-
+!elseif "$(VSTARGET)" == "VS2012"
+MCSFLAGS = $(MCSFLAGS) /reference:"Microsoft.Build.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(PROGRAMFILES)\Common Files\microsoft shared\MSEnv\PublicAssemblies\Extensibility.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.OLE.Interop.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VS_HOME)\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.Shell.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.dll"
+MCSFLAGS = $(MCSFLAGS) /reference:"$(VSSDK_HOME)\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.Shell.Interop.8.0.dll"
 !endif
 
 all::
diff --git a/vsaddin/config/ice.props b/vsaddin/config/ice.props
index 68f6ec40231..9c5d3000977 100644
--- a/vsaddin/config/ice.props
+++ b/vsaddin/config/ice.props
@@ -1,12 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <IceHome>@installdir@\</IceHome>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="IceHome">
-      <Value>$(IceHome)</Value>
-      <EnvironmentVariable>true</EnvironmentVariable>
-    </BuildMacro>
-  </ItemGroup>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+
+    <PropertyGroup Condition="!Exists('$(IceSourceHome)')">
+        <IceHome>C:\Program Files\ZeroC\Ice-3.4.2</IceHome>
+        <IceInclude>$(IceHome)\include</IceInclude>
+    </PropertyGroup>
+    <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' == 'Win32' And '$(MinimumVisualStudioVersion)' == 10.0">
+        <IceLib>$(IceHome)\lib\vc100</IceLib>
+        <IceBin>$(IceHome)\bin\vc100</IceBin>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' != 'Win32' And '$(MinimumVisualStudioVersion)' == 10.0">
+        <IceLib>$(IceHome)\lib\vc100\$(Platform)</IceLib>
+        <IceBin>$(IceHome)\bin\vc100\$(Platform)</IceBin>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' == 'Win32' And '$(MinimumVisualStudioVersion)' == 11.0">
+        <IceLib>$(IceHome)\lib\vc110</IceLib>
+        <IceBin>$(IceHome)\bin\vc110</IceBin>
+    </PropertyGroup>
+    
+    <PropertyGroup Condition="!Exists('$(IceSourceHome)') And '$(Platform)' != 'Win32' And '$(MinimumVisualStudioVersion)' == 11.0">
+        <IceLib>$(IceHome)\lib\vc110\$(Platform)</IceLib>
+        <IceBin>$(IceHome)\bin\vc110\$(Platform)</IceBin>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="Exists('$(IceSourceHome)')">
+        <IceHome>$(IceSourceHome)</IceHome>
+        <IceInclude>$(IceSourceHome)\cpp\include</IceInclude>
+        <IceLib>$(IceSourceHome)\cpp\lib</IceLib>
+        <IceBin>$(IceSourceHome)\cpp\bin</IceBin>
+    </PropertyGroup>
+    
+    <ItemGroup>
+        <BuildMacro Include="IceHome">
+            <Value>$(IceHome)</Value>
+            <EnvironmentVariable>true</EnvironmentVariable>
+        </BuildMacro>
+        <BuildMacro Include="IceInclude">
+            <Value>$(IceInclude)</Value>
+            <EnvironmentVariable>true</EnvironmentVariable>
+        </BuildMacro>
+        <BuildMacro Include="IceLib">
+            <Value>$(IceLib)</Value>
+            <EnvironmentVariable>true</EnvironmentVariable>
+        </BuildMacro>
+        <BuildMacro Include="IceBin">
+            <Value>$(IceBin)</Value>
+            <EnvironmentVariable>true</EnvironmentVariable>
+        </BuildMacro>
+    </ItemGroup>
 </Project>
diff --git a/vsaddin/config/ice.vsprops b/vsaddin/config/ice.vsprops
deleted file mode 100644
index 2986f0b0fc5..00000000000
--- a/vsaddin/config/ice.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ice"
-	>
-	<UserMacro
-		Name="IceHome"
-		Value="@installdir@\"
-		PerformEnvironmentSet="true"
-	/>
-</VisualStudioPropertySheet>
diff --git a/vsaddin/src/Builder.cs b/vsaddin/src/Builder.cs
index 742921af058..69e8d3b4ac0 100644
--- a/vsaddin/src/Builder.cs
+++ b/vsaddin/src/Builder.cs
@@ -224,7 +224,7 @@ namespace Ice.VisualStudio
                 removeDependency(project, _deletedFile);
                 _deletedFile = null;
                 clearErrors(project);
-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject, false);
             }
             catch(Exception ex)
             {
@@ -322,7 +322,7 @@ namespace Ice.VisualStudio
                 List<Project> rebuildProjects = getRebuildProjects();
                 foreach(Project p in rebuildProjects)
                 {
-                    buildProject(p, false, vsBuildScope.vsBuildScopeProject);
+                    buildProject(p, false, vsBuildScope.vsBuildScopeProject, false);
                 }
                 rebuildProjects.Clear();
             }
@@ -438,7 +438,7 @@ namespace Ice.VisualStudio
                 List<Project> rebuildProjects = getRebuildProjects();
                 foreach(Project p in rebuildProjects)
                 {
-                    buildProject(p, false, vsBuildScope.vsBuildScopeProject);
+                    buildProject(p, false, vsBuildScope.vsBuildScopeProject, false);
                 }
                 rebuildProjects.Clear();
             }
@@ -650,6 +650,10 @@ namespace Ice.VisualStudio
                 Util.unexpectedExceptionWarning(ex);
                 throw;
             }
+            finally
+            {
+                _opened = false;
+            }
         }
 
         public void solutionOpened()
@@ -657,7 +661,8 @@ namespace Ice.VisualStudio
             try
             {
                 _opening = true;
-                DependenciesMap dependenciesMap = getDependenciesMap();
+                DependenciesMap dependenciesMap = getDependenciesMap();
+                _reverseDependencyMap = new Dictionary<ProjectItem, List<Project>>();
 
                 initDocumentEvents();
                 List<Project> projects = Util.buildOrder(_applicationObject.Solution);
@@ -674,7 +679,7 @@ namespace Ice.VisualStudio
                         if(!Util.isVBProject(p))
                         {
                             dependenciesMap[p.Name] = new Dictionary<string, List<string>>();
-                            buildProject(p, true, vsBuildScope.vsBuildScopeSolution);
+                            buildProject(p, true, vsBuildScope.vsBuildScopeSolution, false);
                         }
                     }
                 }
@@ -691,6 +696,7 @@ namespace Ice.VisualStudio
             }
             Util.getCurrentDTE().StatusBar.Text = "Ready";
             _opening = false;
+            _opened = false;
         }
         
         //
@@ -724,11 +730,13 @@ namespace Ice.VisualStudio
                 {
                     components.Add("Ice");
                 }
-                if(!components.Contains("IceUtil"))
+                if(!Util.isWinRTProject(project))
                 {
-                    components.Add("IceUtil");
+                    if(!components.Contains("IceUtil"))
+                    {
+                        components.Add("IceUtil");
+                    }
                 }
-
                 Util.addIceCppLibs(project, components);
             }
             else
@@ -871,7 +879,7 @@ namespace Ice.VisualStudio
                 }
 
                 clearErrors(project);
-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject, false);
                 Util.solutionExplorerRefresh();
             }
             catch(Exception ex)
@@ -883,6 +891,10 @@ namespace Ice.VisualStudio
         
         public void projectAdded(Project project)
         {
+            if(!_opened)
+            {
+                return;
+            }
             try
             {
                 if(Util.isSliceBuilderEnabled(project))
@@ -1002,14 +1014,27 @@ namespace Ice.VisualStudio
                     removeCSharpGeneratedItems(i, remove);
                 }
             }
-        }
-
-        public void buildProject(Project project, bool force, vsBuildScope scope)
+        }
+
+        public void buildProject(Project project, bool force, vsBuildScope scope, bool buildDependencies)
+        {
+            List<Project> builded = new List<Project>();
+            buildProject(project, force, null, scope, buildDependencies, ref builded);
+        }
+
+        public void buildProject(Project project, bool force, vsBuildScope scope, bool buildDependencies, ref List<Project> builded)
         {
-            buildProject(project, force, null, scope);
+            buildProject(project, force, null, scope, buildDependencies, ref builded);
+        }
+
+        public void buildProject(Project project, bool force, ProjectItem excludeItem, vsBuildScope scope, bool buildDependencies)
+        {
+            List<Project> builded = new List<Project>();
+            buildProject(project, force, excludeItem, scope, buildDependencies, ref builded);
         }
 
-        public void buildProject(Project project, bool force, ProjectItem excludeItem, vsBuildScope scope)
+        public void buildProject(Project project, bool force, ProjectItem excludeItem, vsBuildScope scope, bool buildDependencies,
+                                 ref List<Project> builded)
         {
             if(project == null)
             {
@@ -1020,12 +1045,19 @@ namespace Ice.VisualStudio
             {
                 return;
             }
-
+
+            if(builded.Contains(project))
+            {
+                return;
+            }
+            builded.Add(project);
+
+            List<ProjectItem> buildItems = new List<ProjectItem>();
             //
             // When building a single project, we must first build projects 
             // that this project depends on.
-            //
-            if(vsBuildScope.vsBuildScopeProject == scope)
+            //
+            if(vsBuildScope.vsBuildScopeProject == scope && buildDependencies)
             {
                 BuildDependencies dependencies = _applicationObject.Solution.SolutionBuild.BuildDependencies;
                 for(int i = 0; i < dependencies.Count; ++i)
@@ -1035,14 +1067,15 @@ namespace Ice.VisualStudio
                     {
                         continue;
                     }
+
                     if(dp.Project.Equals(project))
                     {
                         System.Array projects = dp.RequiredProjects as System.Array;
                         if(projects != null)
                         {
-                            foreach (Project p in projects)
+                            foreach(Project p in projects)
                             {
-                                buildProject(p, force, vsBuildScope.vsBuildScopeProject);
+                                buildProject(p, force, vsBuildScope.vsBuildScopeProject, buildDependencies, ref builded);
                             }
                         }
                     }
@@ -1079,8 +1112,8 @@ namespace Ice.VisualStudio
                 buildCSharpProject(project, force, excludeItem);
             }
             else if(Util.isCppProject(project))
-            {
-                buildCppProject(project, force);
+            {
+                buildCppProject(project, force, ref buildItems);
             }
 
             if(verboseLevel >= (int)Util.msgLevel.msgDebug)
@@ -1103,10 +1136,23 @@ namespace Ice.VisualStudio
             if(!_opening)
             {
                 dte.StatusBar.Text = "Ready";
+            }
+
+            if(scope == vsBuildScope.vsBuildScopeProject)
+            {
+                List<Project> dependantProjects = new List<Project>();
+                foreach(ProjectItem i in buildItems)
+                {
+                    updateReverseDependencies(i, ref dependantProjects);
+                }
+                foreach(Project p in dependantProjects)
+                {
+                    buildProject(p, force, excludeItem, scope, buildDependencies, ref builded);
+                }
             }
         }
 
-        public bool buildCppProject(Project project, bool force)
+        public bool buildCppProject(Project project, bool force, ref List<ProjectItem> buildedItems)
         {
             VCConfiguration conf = Util.getActiveVCConfiguration(project);
             if(conf.ConfigurationType == ConfigurationTypes.typeGeneric ||
@@ -1143,10 +1189,11 @@ namespace Ice.VisualStudio
                 Util.checkCppRunTimeLibrary(this, project, compilerTool, linkerAdapter);
             }
             string sliceCompiler = getSliceCompilerPath(project);
-            return buildCppProject(project, project.ProjectItems, sliceCompiler, force);
+            return buildCppProject(project, project.ProjectItems, sliceCompiler, force, ref buildedItems);
         }
 
-        public bool buildCppProject(Project project, ProjectItems items, string sliceCompiler, bool force)
+        public bool buildCppProject(Project project, ProjectItems items, string sliceCompiler, bool force,
+                                    ref List<ProjectItem> buildedItems)
         {
             bool success = true;
             List<ProjectItem> tmpItems = Util.clone(items);
@@ -1159,14 +1206,14 @@ namespace Ice.VisualStudio
 
                 if(Util.isProjectItemFilter(i))
                 {
-                    if(!buildCppProject(project, i.ProjectItems, sliceCompiler, force))
+                    if(!buildCppProject(project, i.ProjectItems, sliceCompiler, force, ref buildedItems))
                     {
                         success = false;
                     }
                 }
                 else if(Util.isProjectItemFile(i))
-                {
-                    if(!buildCppProjectItem(project, i, sliceCompiler, force))
+                {
+                    if(!buildCppProjectItem(project, i, sliceCompiler, force, ref buildedItems))
                     {
                         success = false;
                     }
@@ -1175,7 +1222,8 @@ namespace Ice.VisualStudio
             return success;
         }
 
-        public bool buildCppProjectItem(Project project, ProjectItem item, string sliceCompiler, bool force)
+        public bool buildCppProjectItem(Project project, ProjectItem item, string sliceCompiler, bool force,
+                                        ref List<ProjectItem> buildedItems)
         {
             if(project == null)
             {
@@ -1202,12 +1250,14 @@ namespace Ice.VisualStudio
                                               iceFileInfo.FullName, Util.getHeaderExt(project)));
             FileInfo cppFileInfo = new FileInfo(Path.ChangeExtension(hFileInfo.FullName, Util.getSourceExt(project)));
 
-            string output = Path.GetDirectoryName(cppFileInfo.FullName);
-            return buildCppProjectItem(project, output, iceFileInfo, cppFileInfo, hFileInfo, sliceCompiler, force);
+            string output = Path.GetDirectoryName(cppFileInfo.FullName);
+            return buildCppProjectItem(project, output, iceFileInfo, cppFileInfo, hFileInfo, sliceCompiler, force, 
+                                       ref buildedItems);
         }
 
         public bool buildCppProjectItem(Project project, String output, FileSystemInfo ice, FileSystemInfo cpp,
-                                        FileSystemInfo h, string sliceCompiler, bool force)
+                                        FileSystemInfo h, string sliceCompiler, bool force,
+                                        ref List<ProjectItem> buildedItems)
         {
             bool updated = false;
             bool success = false;
@@ -1276,6 +1326,7 @@ namespace Ice.VisualStudio
 
                     if(runSliceCompiler(project, sliceCompiler, ice.FullName, output))
                     {
+                        buildedItems.Add(Util.findItem(ice.FullName, project.ProjectItems));
                         success = true;
                     }
                 }
@@ -1573,63 +1624,27 @@ namespace Ice.VisualStudio
         
         public static string getSliceCompilerPath(Project project)
         {
-            string iceHome = Util.getIceHome();
             string compiler = Util.slice2cpp;
             if(Util.isCSharpProject(project))
             {
                 compiler = Util.slice2cs;
+            }
+
+            if(!String.IsNullOrEmpty(Environment.GetEnvironmentVariable("IceSourceHome")))
+            {
+                return Path.Combine(Environment.GetEnvironmentVariable("IceSourceHome"), "cpp", "bin", compiler);
+            }
+
+            string iceHome = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            if(iceHome.EndsWith("\\vsaddin", StringComparison.CurrentCultureIgnoreCase))
+            {
+                return Path.Combine(iceHome.Substring(0, iceHome.Length - "\\vsaddin".Length), "bin", compiler);
+            }
+            if(iceHome.EndsWith("\\vsaddin\\bin", StringComparison.CurrentCultureIgnoreCase))
+            {
+                return Path.Combine(iceHome.Substring(0, iceHome.Length - "\\vsaddin\\bin".Length), "cpp", "bin", compiler);
             }
-            return Path.Combine(Path.Combine(iceHome, "bin"), compiler);
-        }
-        
-        public static string getSliceCompilerVersion(Project project, string sliceCompiler)
-        {
-            string iceHome = Util.getIceHome();
-            sliceCompiler = Path.Combine(iceHome, Path.Combine("bin", sliceCompiler));
-
-            System.Diagnostics.Process process = new System.Diagnostics.Process();
-            process.StartInfo.FileName = sliceCompiler;
-            process.StartInfo.Arguments = "-v";
-            process.StartInfo.CreateNoWindow = true;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);
-
-            StreamReader reader = new StreamReader();
-            process.OutputDataReceived += new DataReceivedEventHandler(reader.appendData);
-
-            try
-            {
-                process.Start();
-            }
-            catch(InvalidOperationException ex)
-            {
-                Util.write(project, Util.msgLevel.msgError,
-                           "An exception was thrown when trying to start the Slice compiler\n" +
-                           ex.ToString());
-                
-                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,
-                         "An exception was thrown when trying to start the Slice compiler\n" +
-                         ex.ToString());
-                return "";
-            }
-            catch(System.ComponentModel.Win32Exception ex)
-            {
-                Util.write(project, Util.msgLevel.msgError,
-                           "An exception was thrown when trying to start the Slice compiler\n" +
-                           ex.ToString());
-                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,
-                         "An exception was thrown when trying to start the Slice compiler\n" +
-                         ex.ToString());
-                return "";
-            }
-
-            // Start the asynchronous read of the standard output stream.
-            process.BeginOutputReadLine();
-            string version = process.StandardError.ReadToEnd();
-            process.WaitForExit();
-            return version.Trim();
+            throw new ArgumentException("Unable to determite Slice compiler location");
         }
 
         private static string getSliceCompilerArgs(Project project, string file, bool depend)
@@ -1792,7 +1807,7 @@ namespace Ice.VisualStudio
 
         public bool updateDependencies(Project project, ProjectItem item, string file, string sliceCompiler)
         {
-            Util.write(project, Util.msgLevel.msgInfo, "  Computing dependencies\n");
+            Util.write(project, Util.msgLevel.msgInfo, "  Computing dependencies\n");
 
             if(!File.Exists(sliceCompiler))
             {
@@ -1858,8 +1873,13 @@ namespace Ice.VisualStudio
             process.BeginOutputReadLine();
             // Read Standard error.
             string stderr = process.StandardError.ReadToEnd();
-            process.WaitForExit();
-            
+            process.WaitForExit();
+            if(process.ExitCode != 0)
+            {
+                addError(project, file, TaskErrorCategory.Error, 0, 0, "Slice compiler `" + sliceCompiler +
+                                                        "' failed to start (error code " + process.ExitCode.ToString() + ")");
+                return false;
+            }
             if(parseErrors(project, sliceCompiler, file, stderr))
             {
                 bringErrorsToFront();
@@ -1921,10 +1941,47 @@ namespace Ice.VisualStudio
                 }
             }
             projectDeps[file] = dependencies;
-            dependenciesMap[project.Name] = projectDeps;
-
+            dependenciesMap[project.Name] = projectDeps;
             process.Close();
+
             return true;
+        }
+
+        public void updateReverseDependencies(ProjectItem item, ref List<Project> dependantProjects)
+        {
+            DependenciesMap dependenciesMap = getDependenciesMap();
+            List<Project> projects = Util.buildOrder(_applicationObject.Solution);
+
+            foreach(Project p in projects)
+            {
+                if(p.Equals(item.ContainingProject))
+                {
+                    continue;
+                }
+
+                Dictionary<string, List<string>> projectDependencies = dependenciesMap[p.Name];
+                foreach(KeyValuePair<string, List<string>> pair in projectDependencies)
+                {
+                    bool found = false;
+                    foreach(string f in pair.Value)
+                    {
+                        ProjectItem other = Util.findItem(f);
+                        if(item.Equals(other))
+                        {
+                            if(!dependantProjects.Contains(p))
+                            {
+                                dependantProjects.Add(p);
+                                found = true;
+                            }
+                            break;
+                        }
+                    }
+                    if(found)
+                    {
+                        break;
+                    }
+                }
+            }
         }
 
         public void initDocumentEvents()
@@ -2027,10 +2084,12 @@ namespace Ice.VisualStudio
                 return projects.GetValue(0) as Project;
             }
 
-            projects = (Array)_applicationObject.Solution.Projects;
-            if(projects != null && projects.Length > 0)
-            {
-                return projects.GetValue(0) as Project;
+            if(_applicationObject.Solution.Projects != null)
+            {
+                if (_applicationObject.Solution.Projects != null && _applicationObject.Solution.Projects.Count > 0)
+                {
+                    return _applicationObject.Solution.Projects.Item(1) as Project;
+                }
             }
             return null;
         }
@@ -2196,7 +2255,7 @@ namespace Ice.VisualStudio
                 }
 
                 clearErrors(project);
-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject, false);
             }
             catch(Exception ex)
             {
@@ -2232,7 +2291,7 @@ namespace Ice.VisualStudio
 
                 removeDependency(item.ContainingProject, fullName);
                 clearErrors(item.ContainingProject);
-                buildProject(item.ContainingProject, false, item, vsBuildScope.vsBuildScopeProject);
+                buildProject(item.ContainingProject, false, item, vsBuildScope.vsBuildScopeProject, false);
             }
             catch(Exception ex)
             {
@@ -2288,7 +2347,7 @@ namespace Ice.VisualStudio
                 }
 
                 clearErrors(project);
-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject, false);
             }
             catch(Exception ex)
             {
@@ -2515,7 +2574,13 @@ namespace Ice.VisualStudio
             process.BeginOutputReadLine();
 
             process.WaitForExit();
-
+    
+            if(process.ExitCode != 0)
+            {
+                addError(project, file, TaskErrorCategory.Error, 0, 0, "Slice compiler `" + sliceCompiler + 
+                                                        "' failed to start (error code " + process.ExitCode.ToString() + ")");
+                return false;
+            }
             bool hasErrors = parseErrors(project, sliceCompiler, file, stderr);
             process.Close();
             if(hasErrors)
@@ -2771,7 +2836,7 @@ namespace Ice.VisualStudio
                             {
                                 cleanProject(p, false);
                             }
-                            buildProject(p, false, scope);
+                            buildProject(p, false, scope, true);
 
                             if(hasErrors(p))
                             {
@@ -2803,7 +2868,7 @@ namespace Ice.VisualStudio
                                 {
                                     cleanProject(p, false);
                                 }
-                                buildProject(p, false, scope);
+                                buildProject(p, false, scope, false);
                             }
                         }
                         if(hasErrors())
@@ -3218,7 +3283,7 @@ namespace Ice.VisualStudio
                 {
                     continue;
                 }
-                buildProject(project, false, vsBuildScope.vsBuildScopeProject);
+                buildProject(project, false, vsBuildScope.vsBuildScopeProject, false);
             }
             return 0;
         }
@@ -3417,7 +3482,8 @@ namespace Ice.VisualStudio
         private List<ErrorTask> _errors;
         private int _errorCount;
         private FileTracker _fileTracker;
-        private DependenciesMap _dependenciesMap;
+        private DependenciesMap _dependenciesMap;
+        private Dictionary<ProjectItem, List<Project>> _reverseDependencyMap;
         private string _deletedFile;
         private OutputWindowPane _output;
 
@@ -3461,7 +3527,7 @@ namespace Ice.VisualStudio
 
         private uint _dwCookie;
         private bool _opening = false;
-
+        private bool _opened = false; // True after solutionOpened has been executed.
         public bool commandLine;
     }
 }
diff --git a/vsaddin/src/IceCppConfigurationDialog.cs b/vsaddin/src/IceCppConfigurationDialog.cs
index 73575648364..9d0f4163360 100644
--- a/vsaddin/src/IceCppConfigurationDialog.cs
+++ b/vsaddin/src/IceCppConfigurationDialog.cs
@@ -27,6 +27,25 @@ namespace Ice.VisualStudio
         {
             InitializeComponent();            
             _project = project;
+            _winRT = Util.isWinRTProject(_project);
+
+            if(_winRT)
+            {
+                chkFreeze.Enabled = false;
+                chkFreeze.Checked = false;
+                chkGlacier2.Enabled = false;
+                chkGlacier2.Checked = false;
+                chkIceBox.Enabled = false;
+                chkIceBox.Checked = false;
+                chkIceGrid.Enabled = false;
+                chkIceGrid.Checked = false;
+                chkIcePatch2.Enabled = false;
+                chkIcePatch2.Checked = false;
+                chkIceSSL.Enabled = false;
+                chkIceSSL.Checked = false;
+                chkIceStorm.Enabled = false;
+                chkIceStorm.Checked = false;
+            }
 
             outputDirView.init(this, _project);
             includePathView.init(this, _project);
@@ -252,13 +271,16 @@ namespace Ice.VisualStudio
             extraCompilerOptions.setEnabled(enabled);
             txtDllExportSymbol.Enabled = enabled;
 
-            chkFreeze.Enabled = _staticLib ? false : enabled;
-            chkGlacier2.Enabled = _staticLib ? false : enabled;
-            chkIceBox.Enabled = _staticLib ? false : enabled;
-            chkIceGrid.Enabled = _staticLib ? false : enabled;
-            chkIcePatch2.Enabled = _staticLib ? false : enabled;
-            chkIceSSL.Enabled = _staticLib ? false : enabled;
-            chkIceStorm.Enabled = _staticLib ? false : enabled;
+            if(!_winRT)
+            {
+                chkFreeze.Enabled = _staticLib ? false : enabled;
+                chkIceBox.Enabled = _staticLib ? false : enabled;
+                chkIcePatch2.Enabled = _staticLib ? false : enabled;
+                chkIceSSL.Enabled = _staticLib ? false : enabled;
+                chkGlacier2.Enabled = _staticLib ? false : enabled;
+                chkIceGrid.Enabled = _staticLib ? false : enabled;
+                chkIceStorm.Enabled = _staticLib ? false : enabled;
+            }
         }
         
         private void formClosing(object sender, FormClosingEventArgs e)
@@ -457,11 +479,14 @@ namespace Ice.VisualStudio
                 if(chkEnableBuilder.Checked && !Util.isSliceBuilderEnabled(_project))
                 {
                     Util.addBuilderToProject(_project, iceComponents());
-                    _changed = true;
-                    _initialized = false;
-                    loadComponents();
-                    _initialized = true;
-                    enabling = true;
+                    if(!_winRT)
+                    {
+                        _changed = true;
+                        _initialized = false;
+                        loadComponents();
+                        _initialized = true;
+                        enabling = true;
+                    }
                 }
 
                 bool changed = false;
@@ -526,55 +551,55 @@ namespace Ice.VisualStudio
                 if(!enabling)
                 {
                     
-                    if(chkFreeze.Checked != Util.hasIceCppLib(_project, "Freeze"))
+                    if(!_winRT && chkFreeze.Checked != Util.hasIceCppLib(_project, "Freeze"))
                     {
                         componentChanged("Freeze", chkFreeze.Checked);
                         if(!chkFreeze.Checked)
                         {
                             components.Add("Freeze");
                         }
-                    }
-                    if(chkGlacier2.Checked != Util.hasIceCppLib(_project, "Glacier2"))
+                    }
+                    if(!_winRT && chkGlacier2.Checked != Util.hasIceCppLib(_project, "Glacier2"))
                     {
                         componentChanged("Glacier2", chkGlacier2.Checked);
                         if(!chkGlacier2.Checked)
                         {
                             components.Add("Glacier2");
                         }
-                    }
-                    if(chkIceBox.Checked != Util.hasIceCppLib(_project, "IceBox"))
+                    }
+                    if(!_winRT && chkIceBox.Checked != Util.hasIceCppLib(_project, "IceBox"))
                     {
                         componentChanged("IceBox", chkIceBox.Checked);
                         if(!chkIceBox.Checked)
                         {
                             components.Add("IceBox");
                         }
-                    }
-                    if(chkIceGrid.Checked != Util.hasIceCppLib(_project, "IceGrid"))
+                    }
+                    if(!_winRT && chkIceGrid.Checked != Util.hasIceCppLib(_project, "IceGrid"))
                     {
                         componentChanged("IceGrid", chkIceGrid.Checked);
                         if(!chkIceGrid.Checked)
                         {
                             components.Add("IceGrid");
                         }
-                    }
-                    if(chkIcePatch2.Checked != Util.hasIceCppLib(_project, "IcePatch2"))
+                    }
+                    if(!_winRT && chkIcePatch2.Checked != Util.hasIceCppLib(_project, "IcePatch2"))
                     {
                         componentChanged("IcePatch2", chkIcePatch2.Checked);
                         if(!chkIcePatch2.Checked)
                         {
                             components.Add("IcePatch2");
                         }
-                    }
-                    if(chkIceSSL.Checked != Util.hasIceCppLib(_project, "IceSSL"))
+                    }
+                    if(!_winRT && chkIceSSL.Checked != Util.hasIceCppLib(_project, "IceSSL"))
                     {
                         componentChanged("IceSSL", chkIceSSL.Checked);
                         if(!chkIceSSL.Checked)
                         {
                             components.Add("IceSSL");
                         }
-                    }
-                    if(chkIceStorm.Checked != Util.hasIceCppLib(_project, "IceStorm"))
+                    }
+                    if(!_winRT && chkIceStorm.Checked != Util.hasIceCppLib(_project, "IceStorm"))
                     {
                         componentChanged("IceStorm", chkIceStorm.Checked);
                         if(!chkIceStorm.Checked)
@@ -662,7 +687,7 @@ namespace Ice.VisualStudio
                 return true;
             }
 
-            if(!_staticLib)
+            if(!_staticLib && !_winRT)
             {
                 // Ice libraries
                 if(chkFreeze.Checked != Util.hasIceCppLib(_project, "Freeze"))
@@ -714,5 +739,6 @@ namespace Ice.VisualStudio
         private Project _project;
         private bool _staticLib = false;
         private bool _changed = false;
+        private bool _winRT = false;
     }
 }
diff --git a/vsaddin/src/Makefile.mak b/vsaddin/src/Makefile.mak
index cc9409c2322..7d9ee08691c 100644
--- a/vsaddin/src/Makefile.mak
+++ b/vsaddin/src/Makefile.mak
@@ -20,30 +20,27 @@ TARGETS		= $(top_srcdir)\bin\$(PKG).dll
 PDBS		= $(top_srcdir)\bin\$(PKG).pdb
 
 SRCS		= IceDialog.cs \
-		   ExtraCompilerOptionsView.Designer.cs \
-		   ExtraCompilerOptionsView.cs \
-		   IncludePathView.Designer.cs \
-		   IncludePathView.cs \
-		   AssemblyInfo.cs \
-		   Builder.cs \
-		   Connect.cs \
- 		   FileTracker.cs \
-		   IceCppConfigurationDialog.cs \
-		   IceCppConfigurationDialog.Designer.cs \
-		   IceCsharpConfigurationDialog.cs \
-		   IceCsharpConfigurationDialog.Designer.cs \
-		   IceSilverlightConfigurationDialog.cs \
-		   IceSilverlightConfigurationDialog.Designer.cs \
-		   IceVBConfigurationDialog.cs \
-		   IceVBConfigurationDialog.Designer.cs \
-		   OutputDirView.cs \
-		   OutputDirView.Designer.cs \
-		   Options.cs \
-		   Util.cs
+		  ExtraCompilerOptionsView.Designer.cs \
+		  ExtraCompilerOptionsView.cs \
+		  IncludePathView.Designer.cs \
+		  IncludePathView.cs \
+		  AssemblyInfo.cs \
+		  Builder.cs \
+		  Connect.cs \
+		  FileTracker.cs \
+		  IceCppConfigurationDialog.cs \
+		  IceCppConfigurationDialog.Designer.cs \
+		  IceCsharpConfigurationDialog.cs \
+		  IceCsharpConfigurationDialog.Designer.cs \
+		  IceVBConfigurationDialog.cs \
+		  IceVBConfigurationDialog.Designer.cs \
+		  OutputDirView.cs \
+		  OutputDirView.Designer.cs \
+		  Options.cs \
+		  Util.cs
 
 RESOURCES 	= /resource:IceCppConfigurationDialog.resx \
 	   	  /resource:IceCsharpConfigurationDialog.resx \
-	   	  /resource:IceSilverlightConfigurationDialog.resx \
 	   	  /resource:IceVBConfigurationDialog.resx \
 		  /resource:ExtraCompilerOptionsView.resx \
 		  /resource:IncludePathView.resx \
@@ -66,7 +63,7 @@ install::$(TARGETS)
 	copy $(TARGETS) $(install_bindir)\$(PKG).dll
 	copy ..\config\Ice-$(PKG_PREFIX).AddIn $(install_configdir)\Ice-$(PKG_PREFIX).AddIn
 	copy ..\config\$(PROPERTY_SHEET) $(install_configdir)\$(PROPERTY_SHEET)
-	
+
 clean::
 	-del /q $(TARGETS) $(PDBS)
 
diff --git a/vsaddin/src/Util.cs b/vsaddin/src/Util.cs
index 083b9adc70e..acc85d6ffcc 100644
--- a/vsaddin/src/Util.cs
+++ b/vsaddin/src/Util.cs
@@ -37,6 +37,20 @@ using System.Xml;
 
 namespace Ice.VisualStudio
 {
+    public class InitializationException : System.Exception
+    {
+        public InitializationException(string message) : base(message)
+        {
+        }
+    }
+
+    public enum CPUType
+    { 
+        x86CPUType,
+        x64CPUType,
+        ARMCPUType
+    }
+
     public interface LinkerAdapter
     {
         String AdditionalDependencies
@@ -292,6 +306,11 @@ namespace Ice.VisualStudio
     {
         public enum msgLevel{ msgError, msgInfo, msgDebug };
 
+        public const string MajorVersion = "3";
+        public const string MinorVersion = "4";
+
+        public const string ProjectVersion = "1";
+
         public const string slice2cs = "slice2cs.exe";
         public const string slice2cpp = "slice2cpp.exe";
 
@@ -311,6 +330,7 @@ namespace Ice.VisualStudio
         public const string PropertyIcePrefix = "ZerocIce_Prefix";
         public const string PropertyIceDllExport = "ZerocIce_DllExport";
         public const string PropertyVerboseLevel = "ZerocIce_VerboseLevel";
+        public const string PropertyProjectVersion = "ZerocIce_ProjectVersion";
 
         private static readonly string[] silverlightNames =
         {
@@ -363,6 +383,10 @@ namespace Ice.VisualStudio
             {
                 defaultIceHome = defaultIceHome.Substring(0, defaultIceHome.Length - "\\vsaddin".Length);
             }
+            else if(defaultIceHome.EndsWith("\\vsaddin\\bin", StringComparison.CurrentCultureIgnoreCase))
+            {
+                defaultIceHome = defaultIceHome.Substring(0, defaultIceHome.Length - "\\vsaddin\bin".Length);
+            }
             return defaultIceHome;
         }
 
@@ -391,6 +415,35 @@ namespace Ice.VisualStudio
             return path;
         }
 
+        public static VCPropertySheet icePropertySheet(Project project)
+        {
+            VCPropertySheet sheet = null;
+            if(isCppProject(project))
+            {
+                VCConfiguration configuration = getActiveVCConfiguration(project);
+                if(configuration != null)
+                {
+                    sheet = findPropertySheet(((IVCCollection)configuration.PropertySheets), "ice");
+                }
+            }
+            return sheet;
+        }
+
+        public static VCUserMacro userMacro(Project project, String name)
+        {
+            VCPropertySheet sheet = icePropertySheet(project);
+            VCUserMacro macro = null;
+            foreach(VCUserMacro m in sheet.UserMacros)
+            {
+                if(m.Name.Equals(name))
+                {
+                    macro = m;
+                    break;
+                }
+            }
+            return macro;
+        }
+
         public static VCPropertySheet findPropertySheet(IVCCollection propertySheets, string sheetName)
         {
             VCPropertySheet value = null;
@@ -422,15 +475,16 @@ namespace Ice.VisualStudio
             propSheetFileName += ".vsprops";
 #endif
 
-#if VS2010
+#if VS2010 || VS2012
             propSheetFileName += ".props";
 #endif
 
 
             //
-            // All project configurations must include ice.vsprops (vc90) or ice.props (vc100)
+            // All project configurations must include ice.vsprops (vc90) or IceCommon.props (vc100 | vc110)
             //
             IVCCollection configurations = (IVCCollection)vcProj.Configurations;
+            string[] cppComponents = Util.getCppNames();
             foreach(VCConfiguration vcConfig in configurations)
             {
                 VCPropertySheet newSheet = findPropertySheet(vcConfig.PropertySheets as IVCCollection, "ice");
@@ -449,7 +503,7 @@ namespace Ice.VisualStudio
                     }
 #endif
 
-#if VS2010
+#if VS2010 || VS2012
                     newSheet = vcConfig.AddPropertySheet(propSheetFileName);
 #endif
 
@@ -514,21 +568,24 @@ namespace Ice.VisualStudio
             return path.ToString();
         }
 
-        private static readonly string iceIncludeDir = "$(IceHome)\\include";
-
+        private static readonly string iceIncludeDir = 
+#if VS2008
+            "$(IceHome)\\include";
+#else
+            "$(IceInclude)";
+#endif
         public static bool addCppIncludes(VCCLCompilerTool tool, Project project)
-        {
+        {            
             if(tool == null || project == null)
             {
                 return false;
             }
 
-
+            bool winrt = isWinRTProject(project);
             bool changed = false;
             ComponentList includes = new ComponentList(tool.AdditionalIncludeDirectories);
-            
 
-            if(!includes.Contains(iceIncludeDir) && !includes.Contains(quote(iceIncludeDir)))
+            if(!winrt && !includes.Contains(iceIncludeDir) && !includes.Contains(quote(iceIncludeDir)))
             {
                 changed = true;
                 includes.Add(quote(iceIncludeDir));
@@ -559,17 +616,16 @@ namespace Ice.VisualStudio
             {
                 return;
             }
-
             bool changed = false;
-
+            
             ComponentList includes = new ComponentList(tool.AdditionalIncludeDirectories);
 
-            if(includes.Remove(quote(iceHome + "\\include")))
+            if(includes.Remove(quote(iceHome + "\\include")) || includes.Remove(iceHome + "\\include"))
             {
                 changed = true;
             }
 
-            if(includes.Remove(iceHome + "\\include"))
+            if(includes.Remove(quote(iceIncludeDir)) || includes.Remove(iceIncludeDir))
             {
                 changed = true;
             }
@@ -602,12 +658,12 @@ namespace Ice.VisualStudio
                 configuration.InheritedPropertySheets = sheets.ToString();
             }
 #endif
-#if VS2010
+#if VS2010 || VS2012
             VCPropertySheet sheet = null;
             IVCCollection sheets = (IVCCollection)configuration.PropertySheets;
             foreach(VCPropertySheet s in sheets)
             {
-                if(!s.PropertySheetFile.Equals(configuration.Evaluate("$(ALLUSERSPROFILE)\\ZeroC\\ice.props"),
+                if(!s.PropertySheetFile.Equals(configuration.Evaluate("$(ALLUSERSPROFILE)\\ZeroC\\IceCommon.props"),
                                                StringComparison.CurrentCultureIgnoreCase))
                 {
                     continue;
@@ -695,6 +751,31 @@ namespace Ice.VisualStudio
             return false;
         }
 
+#if VS2012
+        public static void addSdkReference(VCProject project, string component)
+        {
+            string sdkId = component + ", Version=" + Util.MajorVersion + "." + Util.MinorVersion;
+            VCReference reference = (VCReference)((VCReferences)project.VCReferences).Item(sdkId);
+            if(reference != null)
+            {
+                reference.Remove();
+            }
+            project.AddSdkReference(sdkId);
+        }
+
+        public static bool removeSdkReference(VCProject project, string component)
+        {
+            string sdkId = component + ", Version=" + Util.MajorVersion + "." + Util.MinorVersion;
+            VCReference reference = (VCReference)((VCReferences)project.VCReferences).Item(sdkId);
+            if (reference != null)
+            {
+                reference.Remove();
+                return true;
+            }
+            return false;
+        }
+#endif
+
         public static void addCppLib(LinkerAdapter tool, string component, bool debug)
         {
             if(tool == null || String.IsNullOrEmpty(component))
@@ -762,13 +843,13 @@ namespace Ice.VisualStudio
         // Note: Only the last setting in the environment has effect.
         //
         public static void addIceCppEnvironment(VCDebugSettings debugSettings, Project project,
-                                                bool x64)
+                                                CPUType arch)
         {
             if(debugSettings == null || project == null)
             {
                 return;
             }
-            String value = "PATH=" + cppBinDir(project, x64);
+            String value = "PATH=" + cppBinDir(project, arch);
             if(String.IsNullOrEmpty(debugSettings.Environment))
             {
                 debugSettings.Environment = value;
@@ -808,11 +889,11 @@ namespace Ice.VisualStudio
 
             if(index == -1)
             {
-                envs.Add("PATH=" + cppBinDir(project, x64));
+                envs.Add("PATH=" + cppBinDir(project, arch));
             }
             else
             {
-                string binDir = cppBinDir(project, x64);
+                string binDir = cppBinDir(project, arch);
                 ComponentList paths = new ComponentList(assignmentValue(path), ';');
                 while(paths.Contains(binDir))
                 {
@@ -864,17 +945,18 @@ namespace Ice.VisualStudio
             return dir + Path.PathSeparator + path;
         }
 
-        public static string cppBinDir(Project project, bool x64)
+        public static string cppBinDir(Project project, CPUType arch)
         {
+#if VS2010 || VS2012
+            return isWinRTProject(project) ? "$(IceBin)\\winrt" : "$(IceBin)";
+#else
             string cppBinDir = Path.Combine("$(IceHome)", "bin");
-#if VS2010
-            cppBinDir = Path.Combine(cppBinDir, "vc100");
-#endif
-            if(x64)
+            if(arch == CPUType.x64CPUType)
             {
                 cppBinDir = Path.Combine(cppBinDir, "x64");
             }
             return cppBinDir;
+#endif
         }
 
         public static void removeIceCppEnvironment(VCDebugSettings debugSettings, string iceHome)
@@ -884,8 +966,10 @@ namespace Ice.VisualStudio
                 return;
             }
 
+
             string[] _cppBinDirs =
             {
+
                 "bin",
                 "bin\\x64",
                 "bin\\vc100",
@@ -920,6 +1004,11 @@ namespace Ice.VisualStudio
                 path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), Path.Combine(iceHome, dir));
             }
 
+#if VS2010 || VS2012
+            path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), "$(IceBin)\\winrt");
+            path = "PATH=" + removeFromPath(assignmentValue(path).Trim(), "$(IceBin)");
+#endif
+
             if(path.Equals("PATH="))
             {
                 envs.RemoveAt(index);
@@ -937,22 +1026,22 @@ namespace Ice.VisualStudio
             return;
         }
 
-        public static bool addIceCppLibraryDir(LinkerAdapter tool, Project project, bool x64)
+        public static bool addIceCppLibraryDir(LinkerAdapter tool, Project project, CPUType arch)
         {
             if(tool == null || project == null)
             {
                 return false;
             }
 
-            string iceLibDir = "$(IceHome)\\lib";
-#if VS2010
-            iceLibDir += "\\vc100";
-#endif
-            if(x64)
+
+#if VS2010 || VS2012
+            string iceLibDir = isWinRTProject(project) ? "$(IceLib)\\winrt" : "$(IceLib)";
+#else
+            if(arch == CPUType.x64CPUType)
             {
                 iceLibDir += "\\x64";
             }
-
+#endif
             string additionalLibraryDirectories = tool.AdditionalLibraryDirectories;
             if(String.IsNullOrEmpty(additionalLibraryDirectories))
             {
@@ -960,11 +1049,12 @@ namespace Ice.VisualStudio
                 return true;
             }
 
+            ComponentList libs = new ComponentList(additionalLibraryDirectories);
+            bool changed = false;
+#if !VS2010 && !VS2012
             //
             // Remove Ice lib directories that doesn't match the current ice lib dir.
             //
-
-            ComponentList libs = new ComponentList(additionalLibraryDirectories);
             ComponentList remove = new ComponentList();
 
             foreach(string lib in libs)
@@ -981,7 +1071,6 @@ namespace Ice.VisualStudio
                 }            
             }
 
-            bool changed = false;
             foreach(string lib in remove)
             {
                 if(libs.Remove(lib))
@@ -989,7 +1078,7 @@ namespace Ice.VisualStudio
                     changed = true;
                 }
             }
-
+#endif
             if(!libs.Contains(iceLibDir) && 
                !libs.Contains(quote(iceLibDir)))
             {
@@ -1012,27 +1101,37 @@ namespace Ice.VisualStudio
                 return;
             }
 
+            bool changed = false;
+            ComponentList libs = new ComponentList(tool.AdditionalLibraryDirectories);
+            //
+            // Old style lib paths. New configurations use $(IceLib) instead.
+            //
             string[] _cppLibDirs =
             {
                 "lib",
                 "lib\\x64",
                 "lib\\vc100",
-                "lib\\vc100\\x64"
+                "lib\\vc100\\x64",
             };
-
-            bool changed = false;
-            ComponentList libs = new ComponentList(tool.AdditionalLibraryDirectories);
+            
             foreach(string dir in _cppLibDirs)
             {
-                if(libs.Remove(quote(Path.Combine(iceHome, dir))))
-                {
-                    changed = true;
-                }
-                if(libs.Remove(Path.Combine(iceHome, dir)))
+                if(libs.Remove(quote(Path.Combine(iceHome, dir))) ||
+                   libs.Remove(Path.Combine(iceHome, dir)))
                 {
                     changed = true;
                 }
             }
+
+#if VS2010 || VS2012
+            if(libs.Remove(quote("$(IceLib)")) || 
+               libs.Remove("$(IceLib)") ||
+               libs.Remove(quote("$(IceLib)\\winrt")) || 
+               libs.Remove("$(IceLib)\\winrt"))
+            {
+                changed = true;
+            }
+#endif
             if(changed)
             {
                 tool.AdditionalLibraryDirectories = libs.ToString();
@@ -1193,6 +1292,34 @@ namespace Ice.VisualStudio
             return project.Kind == vcContextGuids.vcContextGuidVCProject;
         }
 
+        public static bool isWinRTProject(Project project)
+        {
+            if(isCppProject(project))
+            {
+                ConfigurationManager configManager = project.ConfigurationManager;
+                Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;
+                VCProject vcProject = (VCProject)project.Object;
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+                foreach(VCConfiguration conf in configurations)
+                {
+                    if(!activeConfig.PlatformName.Equals(((VCPlatform)conf.Platform).Name))
+                    {
+                        continue;
+                    }
+                    IVCCollection sheets = (IVCCollection)conf.PropertySheets;
+                    foreach(VCPropertySheet s in sheets)
+                    {
+                        if(s.Name.Equals("Metro style app"))
+                        {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            }
+            return false;
+        }
+
         public static bool isProjectItemFolder(ProjectItem item)
         {
             if(item == null)
@@ -1679,7 +1806,7 @@ namespace Ice.VisualStudio
         // Reference from the project file; this value doesn't change as does CopyLocal.
         //
 
-#if VS2010
+#if VS2010 || VS2012
         //
         // This method requires .NET 4. Microsoft.Build.BuildEngine is deprecated 
         // in .NET 4, so this method uses the new API Microsoft.Build.Evaluation.
@@ -1886,6 +2013,14 @@ namespace Ice.VisualStudio
                 return;
             }
 
+            //
+            // If the project version is the current version we don't need to fix settings.
+            //
+            if(Util.getProjectProperty(p, PropertyProjectVersion).Equals(ProjectVersion))
+            {
+                return; 
+            }
+
             // This variable was removed for 3.4.1.2.
             if(p.Globals.get_VariableExists("ZerocIce_HomeExpanded"))
             {
@@ -1935,13 +2070,15 @@ namespace Ice.VisualStudio
 
                         Util.removeIceCppEnvironment((VCDebugSettings)conf.DebugSettings, iceHome);
                         Util.removeIceCppLibraryDir(linkerAdapter, iceHome);
+                        Util.removeIceCppLibraryDir(linkerAdapter, "$(IceHome)");
                         Util.removeCppIncludes(compilerTool, iceHome, Util.getProjectOutputDirRaw(p));
+                        Util.removeCppIncludes(compilerTool, "$(IceHome)", Util.getProjectOutputDirRaw(p));
 
                         //
                         // Remove ice.props, old property sheet used by VS 2010
                         // from all project configurations.
                         //
-#if VS2010
+#if VS2010 || VS2012
                         VCPropertySheet sheet = null;
                         IVCCollection sheets = (IVCCollection)conf.PropertySheets;
                         foreach(VCPropertySheet s in sheets)
@@ -1976,6 +2113,35 @@ namespace Ice.VisualStudio
                 }
             }
 
+            if(Util.isCppProject(p))
+            {
+                VCProject vcProject = (VCProject)p.Object;
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+                foreach(VCConfiguration conf in configurations)
+                {
+                    if(conf == null)
+                    {
+                        continue;
+                    }
+
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
+                    LinkerAdapter linkerAdapter;
+                    if(staticLib)
+                    {
+                        linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
+                    }
+                    else
+                    {
+                        linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                    }
+
+                    Util.removeIceCppLibraryDir(linkerAdapter, "$(IceHome)");
+                    Util.removeCppIncludes(compilerTool, "$(IceHome)", Util.getProjectOutputDirRaw(p));
+                }
+            }
+
             // This feature was made more general for 3.4.1.2.
             if(p.Globals.get_VariableExists("ZerocIce_ConsoleOutput"))
             {
@@ -1989,6 +2155,8 @@ namespace Ice.VisualStudio
                 }
                 p.Globals.set_VariablePersists("ZerocIce_ConsoleOutput", false);
             }
+
+            Util.setProjectProperty(p, PropertyProjectVersion, ProjectVersion);
         }
 
         public static String getPrecompileHeader(Project project, string file)
@@ -2050,70 +2218,74 @@ namespace Ice.VisualStudio
         public static ComponentList getIceCppComponents(Project project)
         {
             ComponentList components = new ComponentList();
-            ConfigurationManager configManager = project.ConfigurationManager;
-            Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;
-
             VCProject vcProject = (VCProject)project.Object;
-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
-            foreach(VCConfiguration conf in configurations)
+            bool winrt = isWinRTProject(project);
+            if(!winrt)
             {
-                if(conf == null)
-                {
-                    continue;
-                }
-                if(String.IsNullOrEmpty(conf.Name))
-                {
-                    continue;
-                }
-                if(!conf.Name.Equals(activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))
-                {
-                    continue;
-                }
-
-                VCCLCompilerTool compilerTool =
-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-                VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
-                if(linkerTool == null || compilerTool == null)
-                {
-                    break;
-                }
-
-                if(String.IsNullOrEmpty(linkerTool.AdditionalDependencies))
-                {
-                    break;
-                }
-
-                bool debug = isDebug(compilerTool.RuntimeLibrary); 
+                ConfigurationManager configManager = project.ConfigurationManager;
+                Configuration activeConfig = (Configuration)configManager.ActiveConfiguration;
 
-                List<string> componentNames = new List<string>(linkerTool.AdditionalDependencies.Split(' '));
-                foreach(string s in componentNames)
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+                foreach(VCConfiguration conf in configurations)
                 {
-                    if(String.IsNullOrEmpty(s))
+                    if(conf == null)
                     {
                         continue;
                     }
-
-                    int index = s.LastIndexOf('.');
-                    if(index <= 0)
+                    if(String.IsNullOrEmpty(conf.Name))
+                    {
+                        continue;
+                    }
+                    if(!conf.Name.Equals(activeConfig.ConfigurationName + "|" + activeConfig.PlatformName))
                     {
                         continue;
                     }
 
-                    string libName = s.Substring(0, index);
-                    if(libName.EndsWith("d"))
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
+                    if(linkerTool == null || compilerTool == null)
                     {
-                        libName = libName.Substring(0, libName.Length - 1);
+                        break;
                     }
-                    if(String.IsNullOrEmpty(libName))
+
+                    if(String.IsNullOrEmpty(linkerTool.AdditionalDependencies))
                     {
-                        continue;
+                        break;
                     }
 
-                    if(Array.BinarySearch(Util.getCppNames(), libName, StringComparer.CurrentCultureIgnoreCase) < 0)
+                    bool debug = isDebug(compilerTool.RuntimeLibrary); 
+
+                    List<string> componentNames = new List<string>(linkerTool.AdditionalDependencies.Split(' '));
+                    foreach(string s in componentNames)
                     {
-                        continue;
+                        if(String.IsNullOrEmpty(s))
+                        {
+                            continue;
+                        }
+
+                        int index = s.LastIndexOf('.');
+                        if(index <= 0)
+                        {
+                            continue;
+                        }
+
+                        string libName = s.Substring(0, index);
+                        if(libName.EndsWith("d"))
+                        {
+                            libName = libName.Substring(0, libName.Length - 1);
+                        }
+                        if(String.IsNullOrEmpty(libName))
+                        {
+                            continue;
+                        }
+
+                        if(Array.BinarySearch(Util.getCppNames(), libName, StringComparer.CurrentCultureIgnoreCase) < 0)
+                        {
+                            continue;
+                        }
+                        components.Add(libName.Trim());
                     }
-                    components.Add(libName.Trim());
                 }
             }
             return components;
@@ -2174,91 +2346,27 @@ namespace Ice.VisualStudio
             return components;
         }
 
-        public static bool addIceCppConfigurations(Project project)
+        public static void addIceCppConfigurations(Project project)
         {
             if(!isCppProject(project))
             {
-                return false;
+                return;
             }
 
             VCProject vcProject = (VCProject)project.Object;
             IVCCollection configurations = (IVCCollection)vcProject.Configurations;
-            bool changed = false;
-            
-            Util.addIcePropertySheet(project);
-
-            foreach(VCConfiguration conf in configurations)
+            Util.addCppIncludes(project);
+            bool winrt = isWinRTProject(project);
+            if(!winrt)
             {
-                if(addIceCppConfiguration(project, conf))
-                {
-                    changed = true;
-                }
+                Util.addIcePropertySheet(project);
             }
-            return changed;
-        }
-
-        public static bool addIceCppConfiguration(Project project, VCConfiguration conf)
-        {
-            if(!isCppProject(project))
-            {
-                return false;
-            }
-
-            if (conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeGeneric ||
-               conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeUnknown)
-            {
-                string err = "Configuration Type: '" + conf.ConfigurationType.ToString() + "' not suported by Ice Visual Studio Add-in";
-                Util.write(project, Util.msgLevel.msgError,
-                    "------ Slice compilation failed: Project: " + Util.getTraceProjectName(project) + " ------\n\n" +
-                    err);
-                MessageBox.Show(err, "Ice Visual Studio Add-in", MessageBoxButtons.OK, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1,
-                                (MessageBoxOptions)0);
-
-                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0, err);
-
-                return false;
-            }
-
-            bool x64 = false;
-
-            if(conf == null || String.IsNullOrEmpty(conf.Name))
-            {
-                return false;
-            }
-
-
-            x64 = false;
-            VCPlatform platform = (VCPlatform)conf.Platform;
-            if(platform == null || String.IsNullOrEmpty(platform.Name))
-            {
-                return false;
-            }
-
-            if(platform.Name.Equals("x64", StringComparison.CurrentCultureIgnoreCase) ||
-                platform.Name.Equals("Itanium", StringComparison.CurrentCultureIgnoreCase))
-            {
-                x64 = true;
-            }
-            VCCLCompilerTool compilerTool =
-                (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-            VCLinkerTool linkerTool = (VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool"));
-
-            Util.addIceCppEnvironment((VCDebugSettings)conf.DebugSettings, project, x64);
-            bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
-            LinkerAdapter linkerAdapter;
-            if(staticLib)
-            {
-                linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
-            }
-            else
+#if VS2012
+            if(winrt)
             {
-                linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                addSdkReference(vcProject, "IceWinRT");
             }
-
-            bool libChanged = Util.addIceCppLibraryDir(linkerAdapter, project, x64);
-            bool includesChanged = Util.addCppIncludes(compilerTool, project);
-
-            return libChanged | includesChanged;
+#endif
         }
 
         public static void removeIceCppConfigurations(Project project)
@@ -2267,9 +2375,10 @@ namespace Ice.VisualStudio
             {
                 return;
             }
-
+        
             VCProject vcProject = (VCProject)project.Object;
             IVCCollection configurations = (IVCCollection)vcProject.Configurations;
+            bool winrt = isWinRTProject(project);
             foreach(VCConfiguration conf in configurations)
             {
                 if(conf == null)
@@ -2277,24 +2386,10 @@ namespace Ice.VisualStudio
                     continue;
                 }
 
-                VCCLCompilerTool compilerTool =
-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-                bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
-                LinkerAdapter linkerAdapter;
-                if(staticLib)
-                {
-                    linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
-                }
-                else
+                if(!winrt)
                 {
-                    linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                    Util.removeIcePropertySheet(conf);
                 }
-
-
-                Util.removeIceCppEnvironment((VCDebugSettings)conf.DebugSettings, "$(IceHome)");
-                Util.removeIceCppLibraryDir(linkerAdapter, "$(IceHome)");
-                Util.removeCppIncludes(compilerTool, "$(IceHome)", Util.getProjectOutputDirRaw(project));
-                Util.removeIcePropertySheet(conf);
             }
             Util.removeIceCppLibs(project);
         }
@@ -2305,43 +2400,46 @@ namespace Ice.VisualStudio
             {
                 return;
             }
-
+            bool winrt = isWinRTProject(project);
             VCProject vcProject = (VCProject)project.Object;
-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
-
-            foreach(VCConfiguration conf in configurations)
+            if(!winrt)
             {
-                if(conf == null)
-                {
-                    continue;
-                }
-                VCCLCompilerTool compilerTool =
-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-                bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
-                LinkerAdapter linkerAdapter;
-                if(staticLib)
-                {
-                   linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
-                }
-                else
-                { 
-                    linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
-                }
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;
 
-                if(compilerTool == null || linkerAdapter == null)
+                foreach(VCConfiguration conf in configurations)
                 {
-                    continue;
-                }
-
-                bool debug = isDebug(compilerTool.RuntimeLibrary);
+                    if(conf == null)
+                    {
+                        continue;
+                    }
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
+                    LinkerAdapter linkerAdapter;
+                    if(staticLib)
+                    {
+                       linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
+                    }
+                    else
+                    { 
+                        linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                    }
 
-                foreach(string component in components)
-                {
-                    if(String.IsNullOrEmpty(component))
+                    if(compilerTool == null || linkerAdapter == null)
                     {
                         continue;
                     }
-                    Util.addCppLib(linkerAdapter, component, debug);
+
+                    bool debug = isDebug(compilerTool.RuntimeLibrary);
+
+                    foreach(string component in components)
+                    {
+                        if(String.IsNullOrEmpty(component))
+                        {
+                            continue;
+                        }
+                        Util.addCppLib(linkerAdapter, component, debug);
+                    }
                 }
             }
         }
@@ -2359,57 +2457,68 @@ namespace Ice.VisualStudio
                 return removed;
             }
 
+            bool winrt = isWinRTProject(project);
             VCProject vcProject = (VCProject)project.Object;
-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
 
-            foreach(VCConfiguration conf in configurations)
+            if(!winrt)
             {
-                if(conf == null)
-                {
-                    continue;
-                }
-                VCCLCompilerTool compilerTool =
-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-                bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
-                LinkerAdapter linkerAdapter;
-                if(staticLib)
-                {
-                    linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
-                }
-                else
-                {
-                    linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
-                }
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;
 
-                if(compilerTool == null || linkerAdapter == null)
-                {
-                    continue;
-                }
-
-                bool debug = false;
-                if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
-                {
-                    debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
-                             !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
-                }
-                if(!debug)
+                foreach(VCConfiguration conf in configurations)
                 {
-                    debug = conf.Name.Contains("Debug");
-                }
+                    if(conf == null)
+                    {
+                        continue;
+                    }
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
+                    LinkerAdapter linkerAdapter;
+                    if(staticLib)
+                    {
+                        linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
+                    }
+                    else
+                    {
+                        linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                    }
 
-                foreach(string s in components)
-                {
-                    if(String.IsNullOrEmpty(s))
+                    if(compilerTool == null || linkerAdapter == null)
                     {
                         continue;
                     }
 
-                    if(Util.removeCppLib(linkerAdapter, s, debug) && !removed.Contains(s))
+                    bool debug = false;
+                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
                     {
-                        removed.Add(s);
+                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
+                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
+                    }
+                    if(!debug)
+                    {
+                        debug = conf.Name.Contains("Debug");
+                    }
+
+                    foreach(string s in components)
+                    {
+                        if(String.IsNullOrEmpty(s))
+                        {
+                            continue;
+                        }
+
+                        if(Util.removeCppLib(linkerAdapter, s, debug) && !removed.Contains(s))
+                        {
+                            removed.Add(s);
+                        }
                     }
                 }
             }
+#if VS2012
+            else
+            {
+                Util.removeSdkReference((VCProject)project.Object, "IceWinRT");
+            }
+#endif
             return removed;
         }
 
@@ -2447,64 +2556,68 @@ namespace Ice.VisualStudio
                 return false;
             }
 
+            bool winrt = isWinRTProject(project);
             VCProject vcProject = (VCProject)project.Object;
-            IVCCollection configurations = (IVCCollection)vcProject.Configurations;
             bool found = false;
-
-            foreach(VCConfiguration conf in configurations)
+            if(!winrt)
             {
-                if(conf == null)
-                {
-                    continue;
-                }
+                IVCCollection configurations = (IVCCollection)vcProject.Configurations;                
 
-                VCCLCompilerTool compilerTool =
-                    (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
-                bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
-                LinkerAdapter linkerAdapter;
-                if(staticLib)
+                foreach(VCConfiguration conf in configurations)
                 {
-                    linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
-                }
-                else
-                {
-                    linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
-                }
+                    if(conf == null)
+                    {
+                        continue;
+                    }
 
-                if(compilerTool == null || linkerAdapter == null)
-                {
-                    continue;
-                }
+                    VCCLCompilerTool compilerTool =
+                        (VCCLCompilerTool)(((IVCCollection)conf.Tools).Item("VCCLCompilerTool"));
+                    bool staticLib = conf.ConfigurationType == Microsoft.VisualStudio.VCProjectEngine.ConfigurationTypes.typeStaticLibrary;
+                    LinkerAdapter linkerAdapter;
+                    if(staticLib)
+                    {
+                        linkerAdapter = new StaticLinkerAdapter((VCLibrarianTool)(((IVCCollection)conf.Tools).Item("VCLibrarianTool")));
+                    }
+                    else
+                    {
+                        linkerAdapter = new DynamicLinkerAdapter((VCLinkerTool)(((IVCCollection)conf.Tools).Item("VCLinkerTool")));
+                    }
 
-                bool debug = false;
-                if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
-                {
-                    debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
-                             !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
-                }
-                if(!debug)
-                {
-                    debug = conf.Name.Contains("Debug");
-                }
+                    if(compilerTool == null || linkerAdapter == null)
+                    {
+                        continue;
+                    }
 
-                string libName = component;
-                if(debug)
-                {
-                    libName += "d";
-                }
-                libName += ".lib";
+                    bool debug = false;
+                    if(!String.IsNullOrEmpty(compilerTool.PreprocessorDefinitions))
+                    {
+                        debug = (compilerTool.PreprocessorDefinitions.Contains("DEBUG") &&
+                                 !compilerTool.PreprocessorDefinitions.Contains("NDEBUG"));
+                    }
+                    if(!debug)
+                    {
+                        debug = conf.Name.Contains("Debug");
+                    }
 
-                string additionalDependencies = linkerAdapter.AdditionalDependencies;
-                if(String.IsNullOrEmpty(additionalDependencies))
-                {
-                    continue;
-                }
+                    string libName = component;
+                    if(debug)
+                    {
+                        libName += "d";
+                    }
+                    libName += ".lib";
 
-                ComponentList components = new ComponentList(additionalDependencies.Split(' '));
-                if(components.Contains(libName))
-                {
-                    found = true;
-                    break;
+                    string additionalDependencies = linkerAdapter.AdditionalDependencies;
+                    if(String.IsNullOrEmpty(additionalDependencies))
+                    {
+                        continue;
+                    }
+
+                    ComponentList components = new ComponentList(additionalDependencies.Split(' '));
+                    if(components.Contains(libName))
+                    {
+                        found = true;
+                        break;
+                    }
                 }
             }
             return found;
@@ -2564,7 +2677,7 @@ namespace Ice.VisualStudio
         {
             if(isCppProject(project))
             {
-                addIceCppConfigurations(project); ;
+                addIceCppConfigurations(project);
             }
             else
             {
@@ -2635,7 +2748,6 @@ namespace Ice.VisualStudio
             {
                 return false; // Already disabled.
             }
-
             builder.removeBuilderFromProject(project, components);
             return true;
         }
@@ -2650,7 +2762,7 @@ namespace Ice.VisualStudio
         {
             Builder builder = Connect.getBuilder();
             builder.cleanProject(project, false);
-            builder.buildProject(project, true, vsBuildScope.vsBuildScopeProject);
+            builder.buildProject(project, true, vsBuildScope.vsBuildScopeProject, true);
         }
 
         public static int getVerboseLevel(Project p)
@@ -2996,13 +3108,23 @@ namespace Ice.VisualStudio
 
         public static void unexpectedExceptionWarning(Exception ex)
         {
+            string message = "";
+
+            if (ex is InitializationException)
+            {
+                message = ex.Message;
+            }
+            else
+            {
+                message = ex.ToString();
+            }
             try
             {
                 Builder builder = Connect.getBuilder();
                 if(!builder.commandLine)
                 {
                     MessageBox.Show("The Ice Visual Studio Add-in has raised an unexpected exception:\n" +
-                                    ex.ToString(),
+                                    message,
                                     "Ice Visual Studio Add-in", MessageBoxButtons.OK,
                                     MessageBoxIcon.Error,
                                     MessageBoxDefaultButton.Button1,
@@ -3015,7 +3137,7 @@ namespace Ice.VisualStudio
 
             try
             {
-                Util.write(null, Util.msgLevel.msgError, ex.ToString() + "\n");
+                Util.write(null, Util.msgLevel.msgError, message + "\n");
             }
             catch(Exception)
             {
@@ -3389,12 +3511,17 @@ namespace Ice.VisualStudio
                 return false;
             }
 
+            if(isWinRTProject(project))
+            {
+                return true;
+            }
+
             //
             // Ensure that linker settings match the Runtime Library settings.
             //
             ComponentList components = Util.getIceCppComponents(project);
             bool debug = Util.isDebug(compilerTool.RuntimeLibrary);
-            string additionalDependencies = linkerTool.AdditionalDependencies;
+            string additionalDependencies = String.IsNullOrEmpty(linkerTool.AdditionalDependencies) ? "" : linkerTool.AdditionalDependencies;
 
             //
             // For each component we need to check that the correct 
diff --git a/vsaddin/src/addin-vs2012.csproj b/vsaddin/src/addin-vs2012.csproj
new file mode 100644
index 00000000000..f39a344c032
--- /dev/null
+++ b/vsaddin/src/addin-vs2012.csproj
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DB79C06D-CC17-4B29-B4BE-EAE5C8FED3E5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <StartupObject>
+    </StartupObject>
+    <NoStandardLibraries>false</NoStandardLibraries>
+    <AssemblyName>IceVisualStudioAddin-VS2012</AssemblyName>
+    <RootNamespace>Ice.VisualStudio</RootNamespace>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <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>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>TRACE;DEBUG;VS2012</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
+    <DefineConstants>TRACE;VS2012</DefineConstants>
+    <WarningLevel>4</WarningLevel>
+    <IncrementalBuild>false</IncrementalBuild>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;VS2008</DefineConstants>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;VS2008</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>
+    </ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.Build" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Shell.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio 11.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.11.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.VCProject, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.VCProjectEngine, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProjectEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Builder.cs" />
+    <Compile Include="Connect.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ExtraCompilerOptionsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ExtraCompilerOptionsView.Designer.cs">
+      <DependentUpon>ExtraCompilerOptionsView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IceDialog.cs" />
+    <Compile Include="IceVBConfigurationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IceVBConfigurationDialog.Designer.cs">
+      <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FileTracker.cs" />
+    <Compile Include="IceCppConfigurationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IceCppConfigurationDialog.designer.cs">
+      <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IceCsharpConfigurationDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="IceCsharpConfigurationDialog.Designer.cs">
+      <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="IncludePathView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="IncludePathView.Designer.cs">
+      <DependentUpon>IncludePathView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Options.cs" />
+    <Compile Include="OutputDirView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OutputDirView.Designer.cs">
+      <DependentUpon>OutputDirView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Util.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="EnvDTE">
+      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="EnvDTE80">
+      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="Microsoft.VisualStudio.CommandBars">
+      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
+      <VersionMajor>8</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+    <COMReference Include="stdole">
+      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
+      <VersionMajor>2</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+    </COMReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ExtraCompilerOptionsView.resx">
+      <DependentUpon>ExtraCompilerOptionsView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="IceVBConfigurationDialog.resx">
+      <DependentUpon>IceVBConfigurationDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="IceCppConfigurationDialog.resx">
+      <DependentUpon>IceCppConfigurationDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="IceCsharpConfigurationDialog.resx">
+      <DependentUpon>IceCsharpConfigurationDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="IncludePathView.resx">
+      <DependentUpon>IncludePathView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OutputDirView.resx">
+      <DependentUpon>OutputDirView.cs</DependentUpon>
+    </EmbeddedResource>
+  </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>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
+\ No newline at end of file